Loads of updates/fixes. Everything is now zero-based (positions, columns,

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 334280504f7ba30a06c5113c0bd4d1d96962b9c4..646386409ac00d8c39a56a7caea078a1b9864ae7 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -15,6 +15,9 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 #define wxSYS_COLOUR_BACKGROUND        1
@@ -154,26 +157,26 @@ 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 )