Catch all exceptions in onPaint functions, because otherwise we show a message box. Message boxes while in a paint handler lead to a crash on win32.

Made a CATCH_ALL_ERRORS macro containing the common catch statements.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1034 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gui/control/card_viewer.cpp

@@ -87,7 +87,9 @@ void CardViewer::onPaint(wxPaintEvent&) {
 	// draw
 	if (!up_to_date) {
 		up_to_date = true;
-		draw(dc);
+		try {
+			draw(dc);
+		} CATCH_ALL_ERRORS(false); // don't show message boxes in onPaint!
 	}
 }
 

src/gui/control/gallery_list.cpp

@@ -183,7 +183,9 @@ wxSize GalleryList::DoGetBestSize() const {
 
 void GalleryList::onPaint(wxPaintEvent&) {
 	wxBufferedPaintDC dc(this);
-	OnDraw(dc);
+	try {
+		OnDraw(dc);
+	} CATCH_ALL_ERRORS(false); // don't show message boxes in onPaint!
 }
 void GalleryList::OnDraw(DC& dc) {
 	wxSize cs = GetClientSize();

src/gui/control/graph.cpp

@@ -985,16 +985,18 @@ size_t GraphControl::getDimensionality() const {
 
 void GraphControl::onPaint(wxPaintEvent&) {
 	wxBufferedPaintDC dc(this);
-	wxSize cs = GetClientSize();
+	try {
-	RotatedDC rdc(dc, 0, RealRect(RealPoint(0,0),cs), 1, QUALITY_LOW);
+		wxSize cs = GetClientSize();
-	rdc.SetPen(*wxTRANSPARENT_PEN);
+		RotatedDC rdc(dc, 0, RealRect(RealPoint(0,0),cs), 1, QUALITY_LOW);
-	rdc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+		rdc.SetPen(*wxTRANSPARENT_PEN);
-	rdc.DrawRectangle(rdc.getInternalRect());
+		rdc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-	if (graph) {
+		rdc.DrawRectangle(rdc.getInternalRect());
-		for (int layer = LAYER_BOTTOM ; layer < LAYER_COUNT ; ++layer) {
+		if (graph) {
-			graph->draw(rdc, current_item, (DrawLayer)layer);
+			for (int layer = LAYER_BOTTOM ; layer < LAYER_COUNT ; ++layer) {
+				graph->draw(rdc, current_item, (DrawLayer)layer);
+			}
 		}
-	}
+	} CATCH_ALL_ERRORS(false); // don't show message boxes in onPaint!
 }
 
 void GraphControl::onSize(wxSizeEvent&) {

src/gui/packages_window.cpp

@@ -115,6 +115,7 @@ class PackageInfoPanel : public wxPanel {
 	DECLARE_EVENT_TABLE();
 	
 	void onPaint(wxPaintEvent&);
+	void draw(DC&);
 };
 
 PackageInfoPanel::PackageInfoPanel(Window* parent)
@@ -128,6 +129,11 @@ void PackageInfoPanel::setPackage(const InstallablePackageP& package) {
 
 void PackageInfoPanel::onPaint(wxPaintEvent&) {
 	wxBufferedPaintDC dc(this);
+	try {
+		draw(dc);
+	} CATCH_ALL_ERRORS(false); // don't show message boxes in onPaint!
+}
+void PackageInfoPanel::draw(DC& dc) {
 	wxSize cs = GetClientSize();
 	dc.SetPen(*wxTRANSPARENT_PEN);
 	dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

src/gui/symbol/control.cpp

@@ -200,7 +200,9 @@ void SymbolControl::draw(DC& dc) {
 }
 void SymbolControl::onPaint(wxPaintEvent&) {
 	wxBufferedPaintDC dc(this);
-	draw(dc);
+	try {
+		draw(dc);
+	} CATCH_ALL_ERRORS(false); // don't show message boxes in onPaint!
 }
 
 // ----------------------------------------------------------------------------- : Events

src/main.cpp

@@ -40,7 +40,7 @@ class MSE : public wxApp {
 	 */
 	int OnRun();
 	/// On exit: write the settings to the config file
-	int  OnExit();
+	int OnExit();
 	/// On exception: display error message
 	bool OnExceptionInMainLoop();
 };
@@ -209,14 +209,7 @@ int MSE::OnRun() {
 		(new WelcomeWindow())->Show();
 		return wxApp::OnRun();
 		
-	} catch (const Error& e) {
+	} CATCH_ALL_ERRORS(true);
-		handle_error(e, false);
-	} catch (const std::exception& e) {
-		// we don't throw std::exception ourselfs, so this is probably something serious
-		handle_error(InternalError(String(e.what(), IF_UNICODE(wxConvLocal, wxSTRING_MAXLEN) )), false);
-	} catch (...) {
-		handle_error(InternalError(_("An unexpected exception occurred!")), false);
-	}
 	return EXIT_FAILURE;
 }
 
@@ -234,13 +227,6 @@ int MSE::OnExit() {
 bool MSE::OnExceptionInMainLoop() {
 	try {
 		throw;	// rethrow the exception, so we can examine it
-	} catch (const Error& e) {
+	} CATCH_ALL_ERRORS(true);
-		handle_error(e, false);
-	} catch (const std::exception& e) {
-		// we don't throw std::exception ourselfs, so this is probably something serious
-		handle_error(InternalError(String(e.what(), IF_UNICODE(wxConvLocal, wxSTRING_MAXLEN) )), false);
-	} catch (...) {
-		handle_error(InternalError(_("An unexpected exception occurred!")), false);
-	}
 	return true;
 }

src/util/error.hpp

@@ -123,5 +123,17 @@ void handle_warning(const String& w, bool now = true);
 /** Should be called repeatedly (e.g. in an onIdle event handler) */
 void handle_pending_errors();
 
+/// Catch all types of errors, and pass then to handle_error
+#define CATCH_ALL_ERRORS(handle_now)																\
+	catch (const Error& e) {																		\
+		handle_error(e, false, handle_now);															\
+	} catch (const std::exception& e) {																\
+		/* we don't throw std::exception ourselfs, so this is probably something serious */			\
+		String message(e.what(), IF_UNICODE(wxConvLocal, wxSTRING_MAXLEN) );						\
+		handle_error(InternalError(message), false, handle_now);									\
+	} catch (...) {																					\
+		handle_error(InternalError(_("An unexpected exception occurred!")), false, handle_now);		\
+	}
+
 // ----------------------------------------------------------------------------- : EOF
 #endif