Fixed refresh bug in wxGLCanvas

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index d499026b381d301783387a5cc209da6adefc5cc5..78eef6efe35ac5438715d14dd6d4db1e54fe0da6 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -30,6 +30,14 @@
 #endif
 #include "unistd.h"
 
 #endif
 #include "unistd.h"
 

+// 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); 
+};
+#endif
+

 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -444,6 +452,12 @@ void wxApp::CleanUp(void)
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     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)
     /* check for memory leaks */
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)


@@ -459,12 +473,6 @@ void wxApp::CleanUp(void)
     
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;
     
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;

-
-    wxSystemSettings::Done();
-    
-    wxClassInfo::CleanUpClasses();
-
-    delete[] wxBuffer;

 }
 
 wxLog *wxApp::CreateLogTarget()
 }
 
 wxLog *wxApp::CreateLogTarget()