no message

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index dfcf1d81db6f2d638f116ddb7b9db4524ce71573..b3e40b850ba8f79633f865d1a11197e364ac17b7 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -53,10 +53,20 @@
 
 #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 = (wxFont *) NULL;
+
+void wxSystemSettings::Done() {
+  wxDELETE(g_systemBtnFaceColour);
+  wxDELETE(g_systemBtnShadowColour);
+  wxDELETE(g_systemBtnHighlightColour);
+  wxDELETE(g_systemHighlightColour);
+  wxDELETE(g_systemFont);
+}

 
 wxColour wxSystemSettings::GetSystemColour( int index )
 {
 
 wxColour wxSystemSettings::GetSystemColour( int index )
 {


@@ -80,9 +90,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->bg[0].red >> SHIFT,
                        style->bg[0].green >> SHIFT,
                        style->bg[0].blue >> SHIFT );
          new wxColour( style->bg[0].red >> SHIFT,
                        style->bg[0].green >> SHIFT,
                        style->bg[0].blue >> SHIFT );

-      };
+      }

       return *g_systemBtnFaceColour;
       return *g_systemBtnFaceColour;

-    };
+    }

     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();


@@ -92,9 +102,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->dark[0].red >> SHIFT,
                        style->dark[0].green >> SHIFT,
                        style->dark[0].blue >> SHIFT );
          new wxColour( style->dark[0].red >> SHIFT,
                        style->dark[0].green >> SHIFT,
                        style->dark[0].blue >> SHIFT );

-      };
+      }

       return *g_systemBtnShadowColour;
       return *g_systemBtnShadowColour;

-    };
+    }

     case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
     case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {


@@ -105,9 +115,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
          new wxColour( style->light[0].red >> SHIFT,
                        style->light[0].green >> SHIFT,
                        style->light[0].blue >> SHIFT );
          new wxColour( style->light[0].red >> SHIFT,
                        style->light[0].green >> SHIFT,
                        style->light[0].blue >> SHIFT );

-      };
+      }

       return *g_systemBtnHighlightColour;
       return *g_systemBtnHighlightColour;

-    };
+    }

     case wxSYS_COLOUR_HIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
     case wxSYS_COLOUR_HIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();


@@ -117,9 +127,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 );
          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;
       return *g_systemHighlightColour;

-    };
+    }

     case wxSYS_COLOUR_MENUTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_MENUTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:


@@ -127,21 +137,19 @@ wxColour wxSystemSettings::GetSystemColour( int index )
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;
     case wxSYS_COLOUR_INFOTEXT:
     {
       return *wxBLACK;

-    };
+    }

     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
       return *wxWHITE;
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
       return *wxWHITE;

-    };
+    }

     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {
       return *wxWHITE;    // ?
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {
       return *wxWHITE;    // ?

-    };
-  };
+    }
+  }

   return *wxWHITE;
   return *wxWHITE;

-};
-
-wxFont *g_systemFont = NULL;
+}

 
 wxFont wxSystemSettings::GetSystemFont( int index ) 
 {
 
 wxFont wxSystemSettings::GetSystemFont( int index ) 
 {


@@ -152,7 +160,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
     case wxSYS_SYSTEM_FIXED_FONT:
     {
       return *wxNORMAL_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_ANSI_VAR_FONT:
     case wxSYS_SYSTEM_FONT:
     case wxSYS_DEVICE_DEFAULT_FONT:


@@ -161,12 +169,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
       if (!g_systemFont)
         g_systemFont = new wxFont( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
       return *g_systemFont;
       if (!g_systemFont)
         g_systemFont = new wxFont( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
       return *g_systemFont;

-    };
-  };
+    }
+  }

 
   return wxNullFont;
 }
 
   return wxNullFont;
 }

-;

 
 int wxSystemSettings::GetSystemMetric( int index )
 {
 
 int wxSystemSettings::GetSystemMetric( int index )
 {


@@ -176,8 +183,6 @@ int wxSystemSettings::GetSystemMetric( int index )
       return gdk_screen_width();
     case wxSYS_SCREEN_Y:
       return gdk_screen_height();
       return gdk_screen_width();
     case wxSYS_SCREEN_Y:
       return gdk_screen_height();

-  };
+  }

   return 0;
 }
   return 0;
 }

-;
-