SetLabel() adjusts the label size

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 94f2e686f4fe14f71448a91cf358e18ccadae058..87e05bdc5e31502e9b0df260456d7ee15304919c 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -13,6 +13,10 @@
 #endif
 
 #include "wx/settings.h"
+#include "wx/debug.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
@@ -59,12 +63,13 @@ wxColour *g_systemHighlightColour    = (wxColour *) NULL;
 
 wxFont *g_systemFont = (wxFont *) NULL;
 
-void wxSystemSettings::Done() {
-  wxDELETE(g_systemBtnFaceColour);
-  wxDELETE(g_systemBtnShadowColour);
-  wxDELETE(g_systemBtnHighlightColour);
-  wxDELETE(g_systemHighlightColour);
-  wxDELETE(g_systemFont);
+void wxSystemSettings::Done() 
+{
+    wxDELETE(g_systemBtnFaceColour);
+    wxDELETE(g_systemBtnShadowColour);
+    wxDELETE(g_systemBtnHighlightColour);
+    wxDELETE(g_systemHighlightColour);
+    wxDELETE(g_systemFont);
 }
 
 wxColour wxSystemSettings::GetSystemColour( int index )
@@ -92,6 +97,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnFaceColour;
     }
+    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -104,7 +110,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnShadowColour;
     }
-    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -133,6 +138,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+    case wxSYS_COLOUR_BTNTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;
@@ -152,36 +158,39 @@ wxColour wxSystemSettings::GetSystemColour( int index )
 
 wxFont wxSystemSettings::GetSystemFont( int index ) 
 {
-  switch (index)
-  {
-    case wxSYS_OEM_FIXED_FONT:
-    case wxSYS_ANSI_FIXED_FONT:
-    case wxSYS_SYSTEM_FIXED_FONT:
-    {
-      return *wxNORMAL_FONT;
-    }
-    case wxSYS_ANSI_VAR_FONT:
-    case wxSYS_SYSTEM_FONT:
-    case wxSYS_DEVICE_DEFAULT_FONT:
-    case wxSYS_DEFAULT_GUI_FONT:
+    switch (index)
     {
-      if (!g_systemFont)
-        g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-      return *g_systemFont;
+        case wxSYS_OEM_FIXED_FONT:
+        case wxSYS_ANSI_FIXED_FONT:
+        case wxSYS_SYSTEM_FIXED_FONT:
+        {
+            return *wxNORMAL_FONT;
+        }
+        case wxSYS_ANSI_VAR_FONT:
+        case wxSYS_SYSTEM_FONT:
+        case wxSYS_DEVICE_DEFAULT_FONT:
+        case wxSYS_DEFAULT_GUI_FONT:
+        {
+            if (!g_systemFont)
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+            return *g_systemFont;
+        }
     }
-  }
 
-  return wxNullFont;
+    return wxNullFont;
 }
 
 int wxSystemSettings::GetSystemMetric( int index )
 {
-  switch (index)
-  {
-    case wxSYS_SCREEN_X:
-      return gdk_screen_width();
-    case wxSYS_SCREEN_Y:
-      return gdk_screen_height();
-  }
-  return 0;
+    switch (index)
+    {
+        case wxSYS_SCREEN_X:   return gdk_screen_width();
+        case wxSYS_SCREEN_Y:   return gdk_screen_height();
+        case wxSYS_HSCROLL_Y:  return 15;
+        case wxSYS_VSCROLL_X:  return 15;
+    }
+    
+    wxCHECK_MSG( index, 0, "wxSystemSettings::GetSystemMetric not fully implemented" );
+    
+    return 0;
 }