New module definition file for the ever chaning treectrl class interface.

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 403880e328b942042193ef453ba2041e5e3f3f0c..ec256d13be388f270e298bcc911a151ab7a553a3 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -21,6 +21,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 

+extern GdkFont *GtkGetDefaultGuiFont();
+

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


@@ -33,6 +35,8 @@ static GdkColor     ss_fg;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
 // wxToolTip
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+

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


@@ -65,14 +69,16 @@ void wxToolTip::Apply( wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
         gtk_tooltips_force_window( ss_tooltips );
 
 #if (GTK_MINOR_VERSION > 0)
         gtk_tooltips_force_window( ss_tooltips );

-       
-        GtkStyle *g_style = 
+
+        GtkStyle *g_style =

           gtk_style_copy(
             gtk_widget_get_style( ss_tooltips->tip_window ) );
           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;
         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 );
         gtk_widget_set_style( ss_tooltips->tip_window, g_style );
 #else
         gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );


@@ -99,9 +105,10 @@ void wxToolTip::Enable( bool flag )
 
 void wxToolTip::SetDelay( long msecs )
 {
 
 void wxToolTip::SetDelay( long msecs )
 {

-    if (!ss_tooltips) return;
+    if (!ss_tooltips)
+        return;

 
 

-    gtk_tooltips_set_delay( ss_tooltips, msecs );
+    gtk_tooltips_set_delay( ss_tooltips, (int)msecs );

 }
 
 #endif
 }
 
 #endif