X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/380440110ca482dce658d4f26f6f661a53d322aa..20239453d57b635b6e578c4e46ef02b198512733:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 418183b6e4..78eef6efe3 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -30,7 +30,8 @@
 #endif
 #include "unistd.h"
 
-#ifdef __SUN__
+// add more here if you run into problems
+#if defined(__SUN__) && !defined(__SunOs_5_6) && !defined(__SunOs_5_7) 
 extern "C" 
 {
 void usleep(unsigned long usec); 
@@ -451,6 +452,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)
@@ -466,12 +473,6 @@ void wxApp::CleanUp(void)
     
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;
-
-    wxSystemSettings::Done();
-    
-    wxClassInfo::CleanUpClasses();
-
-    delete[] wxBuffer;
 }
 
 wxLog *wxApp::CreateLogTarget()