Rework IE virtual file system support to use new syntax. Remove now unused code for...

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index ec256d13be388f270e298bcc911a151ab7a553a3..bf98adb334f135d2dc4a5d803d022aef61198fb3 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tooltip.cpp
+// Name:        src/gtk1/tooltip.cpp

 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,29 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "tooltip.h"
-#endif
-
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_TOOLTIPS
 
 
 #if wxUSE_TOOLTIPS
 

-#include "wx/window.h"

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

-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif

 
 

-extern GdkFont *GtkGetDefaultGuiFont();
+#include "wx/gtk1/private.h"

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

-static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
-static GdkColor     ss_bg;
-static GdkColor     ss_fg;
+static GtkTooltips *ss_tooltips = NULL;

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


@@ -40,7 +35,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;

-    m_window = (wxWindow*) NULL;
+    m_window = NULL;

 }
 
 void wxToolTip::SetTip( const wxString &tip )
 }
 
 void wxToolTip::SetTip( const wxString &tip )


@@ -56,39 +51,12 @@ 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.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 );
-
-#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())
-        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
+    if (m_text.empty())
+        m_window->ApplyToolTip( ss_tooltips, NULL );

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


@@ -111,5 +79,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 

-#endif
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}

 
 

+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
+#endif