compilation fix

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 44759110bfc0c378c24c95b2c768984740e40f5d..ec256d13be388f270e298bcc911a151ab7a553a3 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -1,21 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.cpp

-// Purpose:
+// Purpose:     wxToolTip implementation

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "tooltip.h"
+    #pragma implementation "tooltip.h"

 #endif
 
 #endif
 

+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS
+
+#include "wx/window.h"

 #include "wx/tooltip.h"
 
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
 #include "wx/tooltip.h"
 
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 

+extern GdkFont *GtkGetDefaultGuiFont();
+

 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------


@@ -23,27 +30,19 @@
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
 static GdkColor     ss_bg;
 static GdkColor     ss_fg;
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
 static GdkColor     ss_bg;
 static GdkColor     ss_fg;

-    
+

 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+

 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
     m_window = (wxWindow*) NULL;
 }
 
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
     m_window = (wxWindow*) NULL;
 }
 

-bool wxToolTip::Ok() const
-{
-    return (m_window);
-}
-
-wxString wxToolTip::GetTip() const
-{
-    return m_text;
-}
-

 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;


@@ -57,24 +56,39 @@ void wxToolTip::Apply( wxWindow *win )
     if (!ss_tooltips)
     {
         ss_tooltips = gtk_tooltips_new();
     if (!ss_tooltips)
     {
         ss_tooltips = gtk_tooltips_new();

-       
-        ss_fg.red = 0; 
+
+        ss_fg.red = 0;

         ss_fg.green = 0;
         ss_fg.blue = 0;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_fg );
         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 );
         ss_bg.red = 65535;
         ss_bg.green = 65535;
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );

-       
-       gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
+
+#if (GTK_MINOR_VERSION > 0)
+        gtk_tooltips_force_window( ss_tooltips );
+
+        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;
+        gdk_font_unref( g_style->font );
+           g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
+
+        gtk_widget_set_style( ss_tooltips->tip_window, g_style );
+#else
+        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
+#endif

     }
     }

-    
+

     m_window = win;
     m_window = win;

-    
+

     if (m_text.IsEmpty())
     if (m_text.IsEmpty())

-        m_window->ApplyToolTip( ss_tooltips, (char*) NULL );
+        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );

     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
 }
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
 }


@@ -82,7 +96,7 @@ void wxToolTip::Apply( wxWindow *win )
 void wxToolTip::Enable( bool flag )
 {
     if (!ss_tooltips) return;
 void wxToolTip::Enable( bool flag )
 {
     if (!ss_tooltips) return;

-    
+

     if (flag)
         gtk_tooltips_enable( ss_tooltips );
     else
     if (flag)
         gtk_tooltips_enable( ss_tooltips );
     else


@@ -91,8 +105,11 @@ void wxToolTip::Enable( bool flag )
 
 void wxToolTip::SetDelay( long msecs )
 {
 
 void wxToolTip::SetDelay( long msecs )
 {

-    if (!ss_tooltips) return;
-    
-    gtk_tooltips_set_delay( ss_tooltips, msecs );
+    if (!ss_tooltips)
+        return;
+
+    gtk_tooltips_set_delay( ss_tooltips, (int)msecs );

 }
 
 }
 

+#endif
+