export statement added

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index d9fb52626c024b940c5c05e2494e7f59f38015e5..76a1b0565d67c2ba023a5d2f886d3c758109a4fa 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -21,9 +21,6 @@
 #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_BACKGROUND        1
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 #define wxSYS_COLOUR_BACKGROUND        1


@@ -117,7 +114,7 @@ enum wxGtkColourType
     wxGTK_BASE
 };
 
     wxGTK_BASE
 };
 

-// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
+// wxSystemSettings::GetColour() helper: get the colours from a GTK+

 // widget style, return true if we did get them, false to use defaults
 static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
                                    wxGtkWidgetType type = wxGTK_BUTTON,
 // widget style, return true if we did get them, false to use defaults
 static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
                                    wxGtkWidgetType type = wxGTK_BUTTON,


@@ -223,7 +220,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         //case wxSYS_COLOUR_3DSHADOW:
             if (!g_systemBtnShadowColour)
             {
         //case wxSYS_COLOUR_3DSHADOW:
             if (!g_systemBtnShadowColour)
             {

-                wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
+                wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));

                 g_systemBtnShadowColour =
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),
                 g_systemBtnShadowColour =
                    new wxColour((unsigned char) (faceColour.Red() * 0.666),
                                 (unsigned char) (faceColour.Green() * 0.666),


@@ -315,7 +312,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!g_systemHighlightTextColour)
             {
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!g_systemHighlightTextColour)
             {

-                wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+                wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);

                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
                     g_systemHighlightTextColour = new wxColour(*wxBLACK);
                 else
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
                     g_systemHighlightTextColour = new wxColour(*wxBLACK);
                 else


@@ -348,19 +345,6 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
         {
             if (!g_systemFont)
             {
         {
             if (!g_systemFont)
             {

-#if 0
-                GdkFont *gdk_font = GtkGetDefaultGuiFont();
-                if (gdk_font)
-                {
-                    GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
-                    char *name = (char*)font_list->data;
-                    wxString font_string( name );
-                    wxFontData font_data;
-                    g_systemFont = new wxFont( font_string, font_data );
-                }
-                gtk_widget_destroy( widget );
-#endif
-

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