X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b3b54ad8431bca0fa53fa8acae5ba6d4c3e9c7..cfad3750c3ecc821ffae8b9b3de852551270846d:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 89c1d1546a..78511d556f 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -30,11 +30,20 @@ #endif #include "unistd.h" +#ifdef __SUN__ +extern "C" +{ +void usleep(unsigned long usec); +}; +#endif + #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +#include // usleep() on solaris + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -442,6 +451,12 @@ void wxApp::CleanUp(void) delete wxTheApp; wxTheApp = (wxApp*) NULL; + wxSystemSettings::Done(); + + delete[] wxBuffer; + + wxClassInfo::CleanUpClasses(); + /* check for memory leaks */ #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT if (wxDebugContext::CountObjectsLeft() > 0) @@ -457,12 +472,6 @@ void wxApp::CleanUp(void) wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); if (oldLog) delete oldLog; - - wxSystemSettings::Done(); - - wxClassInfo::CleanUpClasses(); - - delete[] wxBuffer; } wxLog *wxApp::CreateLogTarget()