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 109f4658a68f3b31284c12dc321064b0ed6d2d73..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


@@ -18,8 +21,7 @@
 #include "wx/window.h"
 #include "wx/tooltip.h"
 
 #include "wx/window.h"
 #include "wx/tooltip.h"
 

-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"

 
 extern GdkFont *GtkGetDefaultGuiFont();
 
 
 extern GdkFont *GtkGetDefaultGuiFont();
 


@@ -35,6 +37,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,22 +69,16 @@ 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_MINOR_VERSION > 0)

         gtk_tooltips_force_window( ss_tooltips );
         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 );
         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;