X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/899544330f37440c140b72a014c518a911b5b7a4..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/settings.cpp?ds=inline

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index a428fd858f..00222f1de6 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -82,7 +82,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     switch ( type )
     {
         default:
-            wxFAIL_MSG( _T("unexpected GTK widget type") );
+            wxFAIL_MSG( wxT("unexpected GTK widget type") );
             // fall through
 
         case wxGTK_BUTTON:
@@ -108,7 +108,7 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         switch ( colour )
         {
             default:
-                wxFAIL_MSG( _T("unexpected GTK colour type") );
+                wxFAIL_MSG( wxT("unexpected GTK colour type") );
                 // fall through
 
             case wxGTK_FG:
@@ -149,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);
-    gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
+    gtk_object_sink(reinterpret_cast<GtkObject*>(tooltips));
 }
 
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
@@ -250,6 +250,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         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;
@@ -324,7 +325,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 
         case wxSYS_COLOUR_MAX:
         default:
-            wxFAIL_MSG( _T("unknown system colour index") );
+            wxFAIL_MSG( wxT("unknown system colour index") );
     }
 
     return *wxWHITE;