crash in some very special case when arrows were used to move around fixed

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 7b938e76671dc60dbb27fae6c25ad7d987baa4b9..0f4c0825c3a510f4f8f93106b3d5491874f5bd2a 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -30,11 +30,21 @@
 #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) && !defined(__SUNPRO_CC)
+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 "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 

+#include   <unistd.h> // usleep() on solaris
+

 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------


@@ -302,6 +312,9 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);

+    
+    win->OnInternalIdle();
+    

     win->ProcessEvent(event);
 
     if (event.MoreRequested())
     win->ProcessEvent(event);
 
     if (event.MoreRequested())


@@ -381,8 +394,10 @@ bool wxApp::Initialize(void)
     
     wxSystemSettings::Init();
   
     
     wxSystemSettings::Init();
   

+/*

     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();

+*/

 
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();
 
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();


@@ -423,8 +438,10 @@ void wxApp::CleanUp(void)
     if (wxTheColourDatabase) delete wxTheColourDatabase;
     wxTheColourDatabase = (wxColourDatabase*) NULL;
     
     if (wxTheColourDatabase) delete wxTheColourDatabase;
     wxTheColourDatabase = (wxColourDatabase*) NULL;
     

+/*

     if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
     wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
     if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
     wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;

+*/

     
     wxDeleteStockObjects();
 
     
     wxDeleteStockObjects();
 


@@ -435,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)


@@ -450,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()