fixed process termination handling

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 72b4c3e2a804cd6d03a51e6b7eb95b1e7e75a75f..99894b71a27510b7b8b7f9c7106d20fc62f92e63 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -15,8 +15,8 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
 #include "wx/settings.h"
 #include "wx/debug.h"
 

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

 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0


@@ -56,7 +56,7 @@
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 

-wxColour *g_systemWinColour          = (wxColour *) NULL;
+//wxColour *g_systemWinColour          = (wxColour *) NULL;

 wxColour *g_systemBtnFaceColour      = (wxColour *) NULL;
 wxColour *g_systemBtnShadowColour    = (wxColour *) NULL;
 wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
 wxColour *g_systemBtnFaceColour      = (wxColour *) NULL;
 wxColour *g_systemBtnShadowColour    = (wxColour *) NULL;
 wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;


@@ -66,7 +66,7 @@ wxFont *g_systemFont = (wxFont *) NULL;
 
 void wxSystemSettings::Done() 
 {
 
 void wxSystemSettings::Done() 
 {

-    delete g_systemWinColour;
+//    delete g_systemWinColour;

     delete g_systemBtnFaceColour;
     delete g_systemBtnShadowColour;
     delete g_systemBtnHighlightColour;
     delete g_systemBtnFaceColour;
     delete g_systemBtnShadowColour;
     delete g_systemBtnHighlightColour;


@@ -88,62 +88,50 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_INACTIVEBORDER:
     case wxSYS_COLOUR_BTNFACE:
     {
     case wxSYS_COLOUR_INACTIVEBORDER:
     case wxSYS_COLOUR_BTNFACE:
     {

-      GtkStyle *style = gtk_widget_get_default_style();

       if (!g_systemBtnFaceColour)
       {
         g_systemBtnFaceColour = 
       if (!g_systemBtnFaceColour)
       {
         g_systemBtnFaceColour = 

-         new wxColour( style->bg[0].red >> SHIFT,
-                       style->bg[0].green >> SHIFT,
-                       style->bg[0].blue >> SHIFT );
+         new wxColour( 0xd6d6 >> SHIFT,
+                       0xd6d6 >> SHIFT,
+                       0xd6d6 >> SHIFT );

       }
       return *g_systemBtnFaceColour;
     }
     case wxSYS_COLOUR_WINDOW:
     {
       }
       return *g_systemBtnFaceColour;
     }
     case wxSYS_COLOUR_WINDOW:
     {

-      GtkStyle *style = gtk_widget_get_default_style();
-      if (!g_systemWinColour)
-      {
-        g_systemWinColour = 
-         new wxColour( style->base[0].red >> SHIFT,
-                       style->base[0].green >> SHIFT,
-                       style->base[0].blue >> SHIFT );
-      }
-      return *g_systemWinColour;
+      return *wxWHITE;

     }
     case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
     }
     case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {

-      GtkStyle *style = gtk_widget_get_default_style();

       if (!g_systemBtnShadowColour)
       {
         g_systemBtnShadowColour = 
       if (!g_systemBtnShadowColour)
       {
         g_systemBtnShadowColour = 

-         new wxColour( style->dark[0].red >> SHIFT,
-                       style->dark[0].green >> SHIFT,
-                       style->dark[0].blue >> SHIFT );
+         new wxColour( 0x7530 >> SHIFT,
+                       0x7530 >> SHIFT,
+                       0x7530 >> SHIFT );

       }
       return *g_systemBtnShadowColour;
     }
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
       }
       return *g_systemBtnShadowColour;
     }
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {

-      GtkStyle *style = gtk_widget_get_default_style();

       if (!g_systemBtnHighlightColour)
       {
         g_systemBtnHighlightColour = 
       if (!g_systemBtnHighlightColour)
       {
         g_systemBtnHighlightColour = 

-         new wxColour( style->light[0].red >> SHIFT,
-                       style->light[0].green >> SHIFT,
-                       style->light[0].blue >> SHIFT );
+         new wxColour( 0xea60 >> SHIFT,
+                       0xea60 >> SHIFT,
+                       0xea60 >> SHIFT );

       }
       return *g_systemBtnHighlightColour;
     }
     case wxSYS_COLOUR_HIGHLIGHT:
     {
       }
       return *g_systemBtnHighlightColour;
     }
     case wxSYS_COLOUR_HIGHLIGHT:
     {

-      GtkStyle *style = gtk_widget_get_default_style();

       if (!g_systemHighlightColour)
       {
         g_systemHighlightColour = 
       if (!g_systemHighlightColour)
       {
         g_systemHighlightColour = 

-         new wxColour( style->bg[GTK_STATE_SELECTED].red >> SHIFT,
-                       style->bg[GTK_STATE_SELECTED].green >> SHIFT,
-                       style->bg[GTK_STATE_SELECTED].blue >> SHIFT );
+         new wxColour( 0      >> SHIFT,
+                       0      >> SHIFT,
+                       0x9c40 >> SHIFT );

       }
       return *g_systemHighlightColour;
     }
       }
       return *g_systemHighlightColour;
     }


@@ -203,7 +191,7 @@ int wxSystemSettings::GetSystemMetric( int index )
         case wxSYS_VSCROLL_X:  return 15;
     }
     
         case wxSYS_VSCROLL_X:  return 15;
     }
     

-    wxCHECK_MSG( index, 0, _T("wxSystemSettings::GetSystemMetric not fully implemented") );
+    wxCHECK_MSG( index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented") );

     
     return 0;
 }
     
     return 0;
 }