made wxSplitterWindow::SplitXXX() virtual

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 0df66f47b8aa14f080c97599f04409a063745f57..418183b6e412ba26f5978c45e048c6add2104863 100644 (file)
--- 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   <unistd.h> // usleep() on solaris
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -384,8 +393,10 @@ bool wxApp::Initialize(void)
     
     wxSystemSettings::Init();
   
+/*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
+*/
 
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();
@@ -426,8 +437,10 @@ void wxApp::CleanUp(void)
     if (wxTheColourDatabase) delete wxTheColourDatabase;
     wxTheColourDatabase = (wxColourDatabase*) NULL;
     
+/*
     if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
     wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
+*/
     
     wxDeleteStockObjects();