merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/samples/resource/resource.cpp
+++ b/samples/resource/resource.cpp
@@ -113,8 +113,10 @@ bool MyApp::OnInit(void)

 MyApp::~MyApp()
 {
+#if defined(__WXMSW__)
    delete dialog1;
    delete menu1;
+#endif
 }

 BEGIN_EVENT_TABLE(MyPanel, wxPanel)