wxHTML src code indentation now conforms (more) to wxWin coding style

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 4a491823fa31ccd8c1a23d1c755e8bd0f509425b..7e5bd7e7db57bc721c0902ebbee9af631b123cb3 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -21,6 +21,8 @@
 #include <gdk/gdkprivate.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdkprivate.h>
 #include <gtk/gtk.h>
 

+extern GdkFont *GtkGetDefaultGuiFont();
+

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


@@ -67,6 +69,7 @@ wxColour *g_systemBtnHighlightColour  = (wxColour *) NULL;
 wxColour *g_systemHighlightColour     = (wxColour *) NULL;
 wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
 wxColour *g_systemListBoxColour       = (wxColour *) NULL;
 wxColour *g_systemHighlightColour     = (wxColour *) NULL;
 wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
 wxColour *g_systemListBoxColour       = (wxColour *) NULL;

+wxColour *g_systemBtnTextColour       = (wxColour *) NULL;

 
 wxFont *g_systemFont = (wxFont *) NULL;
 
 
 wxFont *g_systemFont = (wxFont *) NULL;
 


@@ -80,6 +83,7 @@ void wxSystemSettings::Done()
     delete g_systemHighlightTextColour;
     delete g_systemListBoxColour;
     delete g_systemFont;
     delete g_systemHighlightTextColour;
     delete g_systemListBoxColour;
     delete g_systemFont;

+    delete g_systemBtnTextColour;

 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )
 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )


@@ -95,7 +99,36 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:

+        case wxSYS_COLOUR_3DLIGHT:

         {
         {

+            if (!g_systemBtnFaceColour)
+            {
+                GtkWidget *widget = gtk_button_new();
+                GtkStyle *def = gtk_rc_get_style( widget );
+                if (!def)
+                    def = gtk_widget_get_default_style();
+                if (def)
+                {
+                    int red = def->bg[GTK_STATE_NORMAL].red;
+                    int green = def->bg[GTK_STATE_NORMAL].green;
+                    int blue = def->bg[GTK_STATE_NORMAL].blue;
+                    g_systemBtnFaceColour = 
+                           new wxColour( red    >> SHIFT,
+                                         green  >> SHIFT,
+                                                 blue   >> SHIFT );
+                }
+                else
+                {
+                    g_systemBtnFaceColour = 
+                           new wxColour( 0      >> SHIFT,
+                                         0      >> SHIFT,
+                                                 0x9c40 >> SHIFT );
+                }
+                gtk_widget_destroy( widget );
+
+            }
+            return *g_systemBtnFaceColour;
+           /*

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


@@ -104,14 +137,29 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                                              0xd6d6 >> SHIFT );
             }
             return *g_systemBtnFaceColour;
                                              0xd6d6 >> SHIFT );
             }
             return *g_systemBtnFaceColour;

+           */

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

+        case wxSYS_COLOUR_3DDKSHADOW:
+        {
+            return *wxBLACK;
+        }

         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:

+        //case wxSYS_COLOUR_3DSHADOW:

         {
         {

+            if (!g_systemBtnShadowColour)
+            {
+                wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
+                g_systemBtnShadowColour =
+                   new wxColour(faceColour.Red() * 0.666,
+                                faceColour.Green() * 0.666,
+                                faceColour.Blue() * 0.666);
+           }
+  /*

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


@@ -119,10 +167,14 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                                      0x7530 >> SHIFT,
                                              0x7530 >> SHIFT );
             }
                                      0x7530 >> SHIFT,
                                              0x7530 >> SHIFT );
             }

+  */

             return *g_systemBtnShadowColour;
         }
             return *g_systemBtnShadowColour;
         }

-        case wxSYS_COLOUR_BTNHIGHLIGHT:
+        case wxSYS_COLOUR_3DHIGHLIGHT:
+        //case wxSYS_COLOUR_BTNHIGHLIGHT:

         {
         {

+            return * wxWHITE;
+/* I think this should normally be white (JACS 8/2000)

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


@@ -131,6 +183,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
                                              0xea60 >> SHIFT );
             }
             return *g_systemBtnHighlightColour;
                                              0xea60 >> SHIFT );
             }
             return *g_systemBtnHighlightColour;

+*/

         }
         case wxSYS_COLOUR_HIGHLIGHT:
         {
         }
         case wxSYS_COLOUR_HIGHLIGHT:
         {


@@ -193,7 +246,30 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_BTNTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
     case wxSYS_COLOUR_BTNTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {

-      return *wxBLACK;
+            if (!g_systemBtnTextColour)
+            {
+                GtkWidget *widget = gtk_button_new();
+                GtkStyle *def = gtk_rc_get_style( widget );
+                if (!def)
+                    def = gtk_widget_get_default_style();
+                if (def)
+                {
+                    int red = def->fg[GTK_STATE_NORMAL].red;
+                    int green = def->fg[GTK_STATE_NORMAL].green;
+                    int blue = def->fg[GTK_STATE_NORMAL].blue;
+                    g_systemBtnTextColour = 
+                           new wxColour( red    >> SHIFT,
+                                         green  >> SHIFT,
+                                                 blue   >> SHIFT );
+                }
+                else
+                {
+                    g_systemBtnTextColour = 
+                     new wxColour(0, 0, 0);
+                }
+                gtk_widget_destroy( widget );
+            }
+            return *g_systemBtnTextColour;

     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {


@@ -233,19 +309,8 @@ wxFont wxSystemSettings::GetSystemFont( int index )
         {
             if (!g_systemFont)
             {
         {
             if (!g_systemFont)
             {

-                GdkFont *gdk_font = (GdkFont*) NULL;
-                GtkWidget *widget = gtk_button_new();

 #if 0
 #if 0

-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (def)
-                    gdk_font =  def->font;
-                else
-                {
-                    def = gtk_widget_get_default_style();
-                    if (def)
-                        gdk_font =  def->font;
-                }
-#endif
+                GdkFont *gdk_font = GtkGetDefaultGuiFont();

                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;


@@ -254,12 +319,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     wxFontData font_data;
                     g_systemFont = new wxFont( font_string, font_data );
                 }
                     wxFontData font_data;
                     g_systemFont = new wxFont( font_string, font_data );
                 }

-                else
-                {
-                    g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-                }
-                

                 gtk_widget_destroy( widget );
                 gtk_widget_destroy( widget );

+#endif
+
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                

             }
             return *g_systemFont;
         }
             }
             return *g_systemFont;
         }