removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 03f7ebfe98c266b5bf98adc26a848591f2a6c55e..5dd9d17137ceabd1216e5cb5752fffa4ad744421 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tooltip.h"
 #endif
 
     #pragma implementation "tooltip.h"
 #endif
 

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

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


@@ -66,7 +69,6 @@ void wxToolTip::Apply( wxWindow *win )
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
 
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
 

-#if GTK_CHECK_VERSION(1, 2, 0)

         gtk_tooltips_force_window( ss_tooltips );
 
         GtkStyle *g_style =
         gtk_tooltips_force_window( ss_tooltips );
 
         GtkStyle *g_style =


@@ -76,14 +78,7 @@ void wxToolTip::Apply( wxWindow *win )
         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;
 

-#ifndef  __WXGTK20__
-        SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
-#endif
-

         gtk_widget_set_style( ss_tooltips->tip_window, g_style );
         gtk_widget_set_style( ss_tooltips->tip_window, g_style );

-#else // GTK+ 1.0
-        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
-#endif

     }
 
     m_window = win;
     }
 
     m_window = win;