fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index bc5df460c66cb00d786d49c00d4afa5f5258c15b..801ae68eeddee689b0f7f488edb11692425e742b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -1,69 +1,106 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tooltip.cpp
-// Purpose:
+// Name:        src/gtk/tooltip.cpp
+// Purpose:     wxToolTip implementation

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// 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"
+
+#if wxUSE_TOOLTIPS

 
 #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/gtk/private.h"

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

-GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
-GdkColor gs_tooltip_bg;
-GdkColor gs_tooltip_fg;
+static GtkTooltips *gs_tooltips = NULL;

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

-void wxToolTip::Add( wxWindow *tool, const wxString &tip )
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
+wxToolTip::wxToolTip( const wxString &tip )

 {
 {

-    if (!gs_tooltips)
-    {
+    m_text = tip;
+    m_window = NULL;
+}
+
+void wxToolTip::SetTip( const wxString &tip )
+{
+    m_text = tip;
+    GTKApply( m_window );
+}
+
+void wxToolTip::GTKApply( wxWindow *win )
+{
+    if (!win)
+        return;
+
+    if ( !gs_tooltips )
+        gs_tooltips = gtk_tooltips_new();
+
+    m_window = win;
+
+    if (m_text.empty())
+        m_window->GTKApplyToolTip( gs_tooltips, NULL );
+    else
+        m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+}
+
+/* static */
+void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip)
+{
+    if ( !gs_tooltips )

         gs_tooltips = gtk_tooltips_new();
         gs_tooltips = gtk_tooltips_new();

-       
-       gs_tooltip_fg.red = 0;
-       gs_tooltip_fg.green = 0;
-       gs_tooltip_fg.blue = 0;
-        gdk_color_alloc( gtk_widget_get_colormap( tool->GetConnectWidget() ), &gs_tooltip_fg );
-       
-       gs_tooltip_bg.red = 65535;
-       gs_tooltip_bg.green = 65535;
-       gs_tooltip_bg.blue = 50000;
-        gdk_color_alloc( gtk_widget_get_colormap( tool->GetConnectWidget() ), &gs_tooltip_bg );
-       
-       gtk_tooltips_set_colors( gs_tooltips, &gs_tooltip_bg, &gs_tooltip_fg );
-    }
-    
-    gtk_tooltips_set_tip( gs_tooltips, tool->GetConnectWidget(), tip, (gchar*) NULL );
+
+    gtk_tooltips_set_tip(gs_tooltips, w, tip, NULL);

 }
 
 void wxToolTip::Enable( bool flag )
 {
 }
 
 void wxToolTip::Enable( bool flag )
 {

-    if (!gs_tooltips) gs_tooltips = gtk_tooltips_new();
-    
+    if (!gs_tooltips)
+        return;
+

     if (flag)
         gtk_tooltips_enable( gs_tooltips );
     else
         gtk_tooltips_disable( gs_tooltips );
 }
 
     if (flag)
         gtk_tooltips_enable( gs_tooltips );
     else
         gtk_tooltips_disable( gs_tooltips );
 }
 

+G_BEGIN_DECLS
+void gtk_tooltips_set_delay (GtkTooltips *tooltips,
+                             guint delay);
+G_END_DECLS
+

 void wxToolTip::SetDelay( long msecs )
 {
 void wxToolTip::SetDelay( long msecs )
 {

-    if (!gs_tooltips) gs_tooltips = gtk_tooltips_new();
-    
-    gtk_tooltips_set_delay( gs_tooltips, msecs );
+    if (!gs_tooltips)
+        return;
+
+    // FIXME: This is a deprecated function and might not even have an effect.
+    // Try to not use it, after which remove the prototype above.
+    gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
+}
+
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{

 }
 
 }
 

+#endif // wxUSE_TOOLTIPS