applied workaround patch to get rid of crashes in wxrcedit on MSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index b3d23b6a64742fcda431aa6a8635cd331b37264a..015a883b3f4f817688dabd7d5a762026e5d53c05 100644 (file)
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -220,9 +220,18 @@ void PreviewFrame::PreviewPanel()
 }
 
 
+#ifdef __WXMSW__
+// avoid Problems with setting the focus to a no longer existing child
+void PreviewFrame::OnActivate(wxActivateEvent &event)
+{
+}
+#endif
 
 BEGIN_EVENT_TABLE(PreviewFrame, wxFrame)
     EVT_ENTER_WINDOW(PreviewFrame::OnMouseEnter)
+#ifdef __WXMSW__
+    EVT_ACTIVATE(PreviewFrame::OnActivate)
+#endif
 END_EVENT_TABLE()
 
 void PreviewFrame::OnMouseEnter(wxMouseEvent& event)

diff --git a/contrib/utils/wxrcedit/preview.h b/contrib/utils/wxrcedit/preview.h
index 7fee0baa7a866a0a76434f2cee163e5dde9a6dc1..6675c4f75242ff6fed3fb6f6f6b828abdbbb8de8 100644 (file)
--- a/contrib/utils/wxrcedit/preview.h
+++ b/contrib/utils/wxrcedit/preview.h
@@ -57,6 +57,9 @@ class PreviewFrame : public wxFrame
         
         DECLARE_EVENT_TABLE()
         void OnMouseEnter(wxMouseEvent& event);
+#ifdef __WXMSW__
+        void OnActivate(wxActivateEvent &event);
+#endif
 };