X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8461e4c253d4cec65e8f0320246a56d22555eb5e..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index b552654bc4..9a09d850b4 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -60,7 +60,6 @@ #include -extern char *wxBuffer; extern wxList wxPendingDelete; wxApp *wxTheApp = NULL; @@ -89,8 +88,6 @@ long wxApp::sm_lastMessageTime = 0; bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); // GL: I'm annoyed ... I don't know where to put this and I don't want to @@ -143,17 +140,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; @@ -168,9 +155,6 @@ void wxApp::CleanUp() wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; - wxBuffer = NULL; - wxClassInfo::CleanUpClasses(); delete wxTheApp; @@ -763,11 +747,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 {