don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDR...

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index cd0a8670e3fc07d2698a82846eef6d5a8e695bf8..141f3bc17d53e4508007aedbe18d0c07468d0e11 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,30 +7,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef 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
+
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;

-static GdkColor     ss_bg;
-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;


@@ -50,24 +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 );
-
-        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );

     }
 
     m_window = win;
 
     }
 
     m_window = win;
 

-    if (m_text.IsEmpty())
-        m_window->ApplyToolTip( ss_tooltips, (char*) NULL );
+    if (m_text.empty())
+        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );

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


@@ -84,9 +73,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