Add default constructor to wxGraphicsGradientStop.

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 7eb099a0af6365dbd2afccac18ae0fc5c668a875..00222f1de680027ac5c1e8713aaa5101da173ad5 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/settings.cpp
+// Name:        src/gtk1/settings.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)


@@ -12,10 +12,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"

-#include "wx/debug.h"
-#include "wx/cmndata.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+    #include "wx/toplevel.h"
+#endif
+

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

-#include "wx/toplevel.h"

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


@@ -79,7 +82,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:


@@ -105,7 +108,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:


@@ -125,11 +128,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         green = col[state].green;
         blue = col[state].blue;
 
         green = col[state].green;
         blue = col[state].blue;
 

-        ok = TRUE;
+        ok = true;

     }
     else
     {
     }
     else
     {

-        ok = FALSE;
+        ok = false;

     }
 
     gtk_widget_destroy( widget );
     }
 
     gtk_widget_destroy( widget );


@@ -146,7 +149,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 )


@@ -247,6 +250,7 @@ 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:

+        case wxSYS_COLOUR_LISTBOXTEXT:

             if (!gs_objects.m_colBtnText.Ok())
             {
                 int red, green, blue;
             if (!gs_objects.m_colBtnText.Ok())
             {
                 int red, green, blue;


@@ -321,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;


@@ -354,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)
     {


@@ -465,12 +470,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:

-            return FALSE;
+            return false;

 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }