fixing osx_carbon

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index a5348ebaad86953ff7a1d6d98592b46e00f5a64f..815c1e0aee75ccea6e70484f72b2c76b272c2830 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -14,11 +14,10 @@
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/cmndata.h"
+    #include "wx/toplevel.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/toplevel.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -82,7 +81,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     switch ( type )
     {
         default:
     switch ( type )
     {
         default:

-            wxFAIL_MSG( _T("unexpected GTK widget type") );
+            wxFAIL_MSG( wxT("unexpected GTK widget type") );

             // fall through
 
         case wxGTK_BUTTON:
             // fall through
 
         case wxGTK_BUTTON:


@@ -108,7 +107,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         switch ( colour )
         {
             default:
         switch ( colour )
         {
             default:

-                wxFAIL_MSG( _T("unexpected GTK colour type") );
+                wxFAIL_MSG( wxT("unexpected GTK colour type") );

                 // fall through
 
             case wxGTK_FG:
                 // fall through
 
             case wxGTK_FG:


@@ -149,7 +148,7 @@ static void GetTooltipColors()
     gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
     c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
     gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
     gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
     c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
     gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);

-    gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
+    gtk_object_sink(reinterpret_cast<GtkObject*>(tooltips));

 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )


@@ -166,7 +165,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:

-            if (!gs_objects.m_colBtnFace.Ok())
+            if (!gs_objects.m_colBtnFace.IsOk())

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue) )
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue) )


@@ -191,7 +190,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:
         case wxSYS_COLOUR_GRAYTEXT:
         case wxSYS_COLOUR_BTNSHADOW:
         //case wxSYS_COLOUR_3DSHADOW:

-            if (!gs_objects.m_colBtnShadow.Ok())
+            if (!gs_objects.m_colBtnShadow.IsOk())

             {
                 wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
                 gs_objects.m_colBtnShadow =
             {
                 wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
                 gs_objects.m_colBtnShadow =


@@ -207,7 +206,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             return * wxWHITE;
 
         case wxSYS_COLOUR_HIGHLIGHT:
             return * wxWHITE;
 
         case wxSYS_COLOUR_HIGHLIGHT:

-            if (!gs_objects.m_colHighlight.Ok())
+            if (!gs_objects.m_colHighlight.IsOk())

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,


@@ -226,7 +225,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             return gs_objects.m_colHighlight;
 
         case wxSYS_COLOUR_LISTBOX:
             return gs_objects.m_colHighlight;
 
         case wxSYS_COLOUR_LISTBOX:

-            if (!gs_objects.m_colListBox.Ok())
+            if (!gs_objects.m_colListBox.IsOk())

             {
                 int red, green, blue;
                 if ( GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( GetColourFromGTKWidget(red, green, blue,


@@ -250,7 +249,8 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_CAPTIONTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:

-            if (!gs_objects.m_colBtnText.Ok())
+        case wxSYS_COLOUR_LISTBOXTEXT:
+            if (!gs_objects.m_colBtnText.IsOk())

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,


@@ -270,19 +270,20 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             return gs_objects.m_colBtnText;
 
         case wxSYS_COLOUR_INFOBK:
             return gs_objects.m_colBtnText;
 
         case wxSYS_COLOUR_INFOBK:

-            if (!gs_objects.m_colTooltip.Ok()) {
+            if (!gs_objects.m_colTooltip.IsOk()) {

                 GetTooltipColors();
             }
             return gs_objects.m_colTooltip;
 
         case wxSYS_COLOUR_INFOTEXT:
                 GetTooltipColors();
             }
             return gs_objects.m_colTooltip;
 
         case wxSYS_COLOUR_INFOTEXT:

-            if (!gs_objects.m_colTooltipText.Ok()) {
+            if (!gs_objects.m_colTooltipText.IsOk()) {

                 GetTooltipColors();
             }
             return gs_objects.m_colTooltipText;
 
                 GetTooltipColors();
             }
             return gs_objects.m_colTooltipText;
 

+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:

         case wxSYS_COLOUR_HIGHLIGHTTEXT:
         case wxSYS_COLOUR_HIGHLIGHTTEXT:

-            if (!gs_objects.m_colHighlightText.Ok())
+            if (!gs_objects.m_colHighlightText.IsOk())

             {
                 wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
             {
                 wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
                 if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)


@@ -297,7 +298,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:
 
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_MENUHILIGHT:

-            if (!gs_objects.m_colMenuItemHighlight.Ok())
+            if (!gs_objects.m_colMenuItemHighlight.IsOk())

             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,
             {
                 int red, green, blue;
                 if ( !GetColourFromGTKWidget(red, green, blue,


@@ -324,7 +325,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_MAX:
         default:
 
         case wxSYS_COLOUR_MAX:
         default:

-            wxFAIL_MSG( _T("unknown system colour index") );
+            wxFAIL_MSG( wxT("unknown system colour index") );

     }
 
     return *wxWHITE;
     }
 
     return *wxWHITE;


@@ -345,7 +346,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         {
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         {

-            if (!gs_objects.m_fontSystem.Ok())
+            if (!gs_objects.m_fontSystem.IsOk())

             {
                 gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
             }
             {
                 gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
             }


@@ -357,7 +358,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
     }
 }
 
     }
 }
 

-int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
+int
+wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
     switch (index)
     {
 {
     switch (index)
     {