Removed a deprecated wxBitmap constructor, and some

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 03f7ebfe98c266b5bf98adc26a848591f2a6c55e..145eee8837e4ff0e472d869f95b096d418b2963c 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -66,7 +66,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 +75,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;