fixed frame style

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d953d8d0dafe52d1f602cb1b71cd60f3730d33e2..0aec5a8f56147920dd5fd134d8b40a2a16f322f8 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -28,13 +28,15 @@
 #include "wx/module.h"
 #include "wx/image.h"
 
 #include "wx/module.h"
 #include "wx/image.h"
 

+#if wxUSE_THREADS

 #include "wx/thread.h"
 #include "wx/thread.h"

+#endif

 
 #include "unistd.h"
 
 
 #include "unistd.h"
 

-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 


@@ -295,9 +297,13 @@ wxApp::~wxApp()
 
 bool wxApp::OnInitGui()
 {
 
 bool wxApp::OnInitGui()
 {

-    /* Nothing to do for 15, 16, 24, 32 bit displays */
+    /* on some SGIs, the default visual is just 256 colours, so we
+       make sure we get the best. this can sometimes be wasteful,
+       of course, but what do these guys pay $30.000 for? */
+    GdkVisual* visual = gdk_visual_get_best();
+    gtk_widget_set_default_visual( visual );

 
 

-    GdkVisual *visual = gdk_visual_get_system();
+    /* Nothing to do for 15, 16, 24, 32 bit displays */

     if (visual->depth > 8) return TRUE;
 
         /* this initiates the standard palette as defined by GdkImlib
     if (visual->depth > 8) return TRUE;
 
         /* this initiates the standard palette as defined by GdkImlib


@@ -361,14 +367,17 @@ bool wxApp::OnInitGui()
                 }
                else
                {
                 }
                else
                {

+#if (GTK_MINOR_VERSION > 0)

                    /* assume 8-bit true or static colors. this really
                       exists. */
                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
                    /* assume 8-bit true or static colors. this really
                       exists. */
                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;

+#else
+                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+#endif

                }
                }

-               

                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }


@@ -406,9 +415,11 @@ void wxApp::OnIdle( wxIdleEvent &event )
     DeletePendingObjects();
 
     /* flush the logged messages if any */
     DeletePendingObjects();
 
     /* flush the logged messages if any */

+#if wxUSE_LOG

     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();

+#endif // wxUSE_LOG

 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();


@@ -571,9 +582,6 @@ bool wxApp::Initialize()
 
     wxImage::InitStandardHandlers();
 
 
     wxImage::InitStandardHandlers();
 

-    /* no global cursor under X
-       g_globalCursor = new wxCursor; */
-

     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 


@@ -635,6 +643,7 @@ void wxApp::CleanUp()
     }
 #endif // Debug
 
     }
 #endif // Debug
 

+#if wxUSE_LOG

     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 


@@ -647,6 +656,7 @@ wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
 {
     return new wxLogGui;
 }

+#endif // wxUSE_LOG

 
 //-----------------------------------------------------------------------------
 // wxEntry
 
 //-----------------------------------------------------------------------------
 // wxEntry


@@ -656,6 +666,8 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+

     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );


@@ -730,6 +742,7 @@ int wxEntry( int argc, char *argv[] )
         }
     }
 
         }
     }
 

+#if wxUSE_LOG

     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())


@@ -741,6 +754,7 @@ int wxEntry( int argc, char *argv[] )
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;

+#endif // wxUSE_LOG

 
     wxApp::CleanUp();
 
 
     wxApp::CleanUp();