Trace module initialization and cleanup.

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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index bf2d3b2f2093288c7a0bbd340d10670b9f2a891b..c7e586c7992329ae2034ef84bcdedb893159bdd7 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settings.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -44,7 +39,9 @@ struct wxSystemObjects
              m_colHighlightText,
              m_colListBox,
              m_colBtnText,
              m_colHighlightText,
              m_colListBox,
              m_colBtnText,

-             m_colMenuItemHighlight;
+             m_colMenuItemHighlight,
+             m_colTooltip,
+             m_colTooltipText;

 
     wxFont m_fontSystem;
 };
 
     wxFont m_fontSystem;
 };


@@ -91,7 +88,8 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
 
         case wxGTK_LIST:
             widget = gtk_list_new();
 
         case wxGTK_LIST:
             widget = gtk_list_new();

-       
+            break;
+

         case wxGTK_MENUITEM:
             widget = gtk_menu_item_new();
     }
         case wxGTK_MENUITEM:
             widget = gtk_menu_item_new();
     }


@@ -139,6 +137,18 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
     return ok;
 }
 
     return ok;
 }
 

+static void GetTooltipColors()
+{
+    GtkTooltips* tooltips = gtk_tooltips_new();
+    gtk_tooltips_force_window(tooltips);
+    gtk_widget_ensure_style(tooltips->tip_window);
+    GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
+    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));
+}
+

 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     switch (index)
 wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
 {
     switch (index)


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

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


@@ -257,11 +266,17 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             }
             return gs_objects.m_colBtnText;
 
             }
             return gs_objects.m_colBtnText;
 

-            // this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
-            // tooltip windows - Robert, please change this code to use the
-            // real GTK tooltips when/if you can (TODO)

         case wxSYS_COLOUR_INFOBK:
         case wxSYS_COLOUR_INFOBK:

-            return wxColour(255, 255, 225);
+            if (!gs_objects.m_colTooltip.Ok()) {
+                GetTooltipColors();
+            }
+            return gs_objects.m_colTooltip;
+
+        case wxSYS_COLOUR_INFOTEXT:
+            if (!gs_objects.m_colTooltipText.Ok()) {
+                GetTooltipColors();
+            }
+            return gs_objects.m_colTooltipText;

 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!gs_objects.m_colHighlightText.Ok())
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!gs_objects.m_colHighlightText.Ok())


@@ -307,9 +322,9 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_MAX:
         default:
             wxFAIL_MSG( _T("unknown system colour index") );
         case wxSYS_COLOUR_MAX:
         default:
             wxFAIL_MSG( _T("unknown system colour index") );

-  }
+    }

 
 

-  return *wxWHITE;
+    return *wxWHITE;

 }
 
 wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 }
 
 wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )