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 89d6fe92c55206021703d37ec6955bc04b3e5f34..94f2e686f4fe14f71448a91cf358e18ccadae058 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -2,9 +2,8 @@
 // Name:        settings.cpp
 // Purpose:
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -53,12 +52,12 @@
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
 
 #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);
 
 void wxSystemSettings::Done() {
   wxDELETE(g_systemBtnFaceColour);


@@ -167,7 +166,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
     case wxSYS_DEFAULT_GUI_FONT:
     {
       if (!g_systemFont)
     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 *g_systemFont;
     }
   }


@@ -185,4 +184,4 @@ int wxSystemSettings::GetSystemMetric( int index )
       return gdk_screen_height();
   }
   return 0;
       return gdk_screen_height();
   }
   return 0;

-}
\ No newline at end of file
+}