Dialog Editor corrections for latest wxWin changes; removed wxProp files

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index aa24393c68eb03e74f28eacddf86f819f70c8522..94f2e686f4fe14f71448a91cf358e18ccadae058 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -2,9 +2,8 @@
 // Name:        settings.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -53,12 +52,12 @@
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
-wxColour *g_systemBtnFaceColour      = NULL;
-wxColour *g_systemBtnShadowColour    = NULL;
-wxColour *g_systemBtnHighlightColour = NULL;
-wxColour *g_systemHighlightColour    = NULL;
+wxColour *g_systemBtnFaceColour      = (wxColour *) NULL;
+wxColour *g_systemBtnShadowColour    = (wxColour *) NULL;
+wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
+wxColour *g_systemHighlightColour    = (wxColour *) NULL;
 
-wxFont *g_systemFont = NULL;
+wxFont *g_systemFont = (wxFont *) NULL;
 
 void wxSystemSettings::Done() {
   wxDELETE(g_systemBtnFaceColour);
@@ -90,9 +89,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->bg[0].red >> SHIFT,
                        style->bg[0].green >> SHIFT,
                        style->bg[0].blue >> SHIFT );
-      };
+      }
       return *g_systemBtnFaceColour;
-    };
+    }
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -102,9 +101,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->dark[0].red >> SHIFT,
                        style->dark[0].green >> SHIFT,
                        style->dark[0].blue >> SHIFT );
-      };
+      }
       return *g_systemBtnShadowColour;
-    };
+    }
     case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
@@ -115,9 +114,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->light[0].red >> SHIFT,
                        style->light[0].green >> SHIFT,
                        style->light[0].blue >> SHIFT );
-      };
+      }
       return *g_systemBtnHighlightColour;
-    };
+    }
     case wxSYS_COLOUR_HIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -127,9 +126,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->bg[GTK_STATE_SELECTED].red >> SHIFT,
                        style->bg[GTK_STATE_SELECTED].green >> SHIFT,
                        style->bg[GTK_STATE_SELECTED].blue >> SHIFT );
-      };
+      }
       return *g_systemHighlightColour;
-    };
+    }
     case wxSYS_COLOUR_MENUTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
@@ -137,19 +136,19 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;
-    };
+    }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
       return *wxWHITE;
-    };
+    }
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {
       return *wxWHITE;    // ?
-    };
-  };
+    }
+  }
   return *wxWHITE;
-};
+}
 
 wxFont wxSystemSettings::GetSystemFont( int index ) 
 {
@@ -160,21 +159,20 @@ wxFont wxSystemSettings::GetSystemFont( int index )
     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( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
+        g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
       return *g_systemFont;
-    };
-  };
+    }
+  }
 
   return wxNullFont;
 }
-;
 
 int wxSystemSettings::GetSystemMetric( int index )
 {
@@ -184,8 +182,6 @@ int wxSystemSettings::GetSystemMetric( int index )
       return gdk_screen_width();
     case wxSYS_SCREEN_Y:
       return gdk_screen_height();
-  };
+  }
   return 0;
 }
-;
-