changed wxImage::ComputeHistogram to use wxHashMap

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index b552654bc47f09701e9d400655708250493b95a7..8b019fdf6e64ab9c51d6ee1082329f777fefe230 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -143,17 +143,7 @@ void wxApp::CleanUp()
 
     // Destroy all GDI lists, etc.
 
-    delete wxTheBrushList;
-    wxTheBrushList = NULL;
-
-    delete wxThePenList;
-    wxThePenList = NULL;
-
-    delete wxTheFontList;
-    wxTheFontList = NULL;
-
-    delete wxTheBitmapList;
-    wxTheBitmapList = NULL;
+    wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
@@ -763,11 +753,16 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 // TODO use XmGetPixmap (?) to get the really standard icons!
 
+// XPM hack: make the arrays const
+#define static static const
+
 #include "wx/generic/info.xpm"
 #include "wx/generic/error.xpm"
 #include "wx/generic/question.xpm"
 #include "wx/generic/warning.xpm"
 
+#undef static
+
 wxIcon
 wxApp::GetStdIcon(int which) const
 {