compilation fixes

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index bc5df460c66cb00d786d49c00d4afa5f5258c15b..403880e328b942042193ef453ba2041e5e3f3f0c 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -1,16 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.cpp
-// Purpose:
+// Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "tooltip.h"
+    #pragma implementation "tooltip.h"
 #endif
 
+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS
+
+#include "wx/window.h"
 #include "wx/tooltip.h"
 
 #include "gtk/gtk.h"
@@ -20,50 +25,84 @@
 // global data
 //-----------------------------------------------------------------------------
 
-GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
-GdkColor gs_tooltip_bg;
-GdkColor gs_tooltip_fg;
+static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
+static GdkColor     ss_bg;
+static GdkColor     ss_fg;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 
-void wxToolTip::Add( wxWindow *tool, const wxString &tip )
+wxToolTip::wxToolTip( const wxString &tip )
+{
+    m_text = tip;
+    m_window = (wxWindow*) NULL;
+}
+
+void wxToolTip::SetTip( const wxString &tip )
 {
-    if (!gs_tooltips)
+    m_text = tip;
+    Apply( m_window );
+}
+
+void wxToolTip::Apply( wxWindow *win )
+{
+    if (!win) return;
+
+    if (!ss_tooltips)
     {
-        gs_tooltips = gtk_tooltips_new();
-       
-       gs_tooltip_fg.red = 0;
-       gs_tooltip_fg.green = 0;
-       gs_tooltip_fg.blue = 0;
-        gdk_color_alloc( gtk_widget_get_colormap( tool->GetConnectWidget() ), &gs_tooltip_fg );
+        ss_tooltips = gtk_tooltips_new();
+
+        ss_fg.red = 0;
+        ss_fg.green = 0;
+        ss_fg.blue = 0;
+        gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_fg );
+
+        ss_bg.red = 65535;
+        ss_bg.green = 65535;
+        ss_bg.blue = 50000;
+        gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
+
+#if (GTK_MINOR_VERSION > 0)
+        gtk_tooltips_force_window( ss_tooltips );
        
-       gs_tooltip_bg.red = 65535;
-       gs_tooltip_bg.green = 65535;
-       gs_tooltip_bg.blue = 50000;
-        gdk_color_alloc( gtk_widget_get_colormap( tool->GetConnectWidget() ), &gs_tooltip_bg );
+        GtkStyle *g_style = 
+          gtk_style_copy(
+            gtk_widget_get_style( ss_tooltips->tip_window ) );
+           
+        g_style->fg[GTK_STATE_NORMAL] = ss_fg;
+        g_style->bg[GTK_STATE_NORMAL] = ss_bg;
        
-       gtk_tooltips_set_colors( gs_tooltips, &gs_tooltip_bg, &gs_tooltip_fg );
+        gtk_widget_set_style( ss_tooltips->tip_window, g_style );
+#else
+        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
+#endif
     }
-    
-    gtk_tooltips_set_tip( gs_tooltips, tool->GetConnectWidget(), tip, (gchar*) NULL );
+
+    m_window = win;
+
+    if (m_text.IsEmpty())
+        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
+    else
+        m_window->ApplyToolTip( ss_tooltips, m_text );
 }
 
 void wxToolTip::Enable( bool flag )
 {
-    if (!gs_tooltips) gs_tooltips = gtk_tooltips_new();
-    
+    if (!ss_tooltips) return;
+
     if (flag)
-        gtk_tooltips_enable( gs_tooltips );
+        gtk_tooltips_enable( ss_tooltips );
     else
-        gtk_tooltips_disable( gs_tooltips );
+        gtk_tooltips_disable( ss_tooltips );
 }
 
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!gs_tooltips) gs_tooltips = gtk_tooltips_new();
-    
-    gtk_tooltips_set_delay( gs_tooltips, msecs );
+    if (!ss_tooltips) return;
+
+    gtk_tooltips_set_delay( ss_tooltips, msecs );
 }
 
+#endif
+