EVT_TEXT_UPDATED bug fixed, text ctrl callbacks simplified

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index f3e3acb598b2273c73bf4a7216971bf333182802..f5fdd8a0f66cb36c0adbacbcdcbb50c38bef8209 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -1,21 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tooltip.cpp

-// Purpose:
+// 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "tooltip.h"
+    #pragma implementation "tooltip.h"

 #endif
 
 #endif
 

+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS
+
+#include "wx/window.h"

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

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

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


@@ -23,62 +36,59 @@
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;

-    
-    m_tooltips = (GtkTooltips*) NULL;
-    
-    m_fg = new GdkColor;
-    m_fg->red = 0; 
-    m_fg->green = 0;
-    m_fg->blue = 0;
-       
-    m_bg = new GdkColor;
-    m_bg->red = 65535;
-    m_bg->green = 65535;
-    m_bg->blue = 50000;
+    m_window = (wxWindow*) NULL;

 }
 
 }
 

-wxToolTip::~wxToolTip()
+void wxToolTip::SetTip( const wxString &tip )

 {
 {

-    gtk_object_unref( GTK_OBJECT(m_tooltips) );
-    
-    delete m_fg;
-    delete m_bg;
+    m_text = tip;
+    Apply( m_window );

 }
 
 }
 

-bool wxToolTip::Ok()
+void wxToolTip::Apply( wxWindow *win )

 {
 {

-    return (m_tooltips);
-}
+    if (!win) return;

 
 

-void wxToolTip::Create( GtkWidget *tool )
-{
-    if (!m_tooltips)
+    if (!ss_tooltips)

     {
     {

-        m_tooltips = gtk_tooltips_new();
-       
-        gdk_color_alloc( gtk_widget_get_colormap( tool ), m_fg );
-        gdk_color_alloc( gtk_widget_get_colormap( tool ), m_bg );
-       
-       gtk_tooltips_set_colors( m_tooltips, m_bg, m_fg );
+        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 );

     }
     }

-    
-    gtk_tooltips_set_tip( m_tooltips, tool, m_text, (gchar*) NULL );
+
+    m_window = win;
+
+    if (m_text.IsEmpty())
+        m_window->ApplyToolTip( ss_tooltips, (char*) NULL );
+    else
+        m_window->ApplyToolTip( ss_tooltips, m_text );

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

-    if (!Ok()) return;
-    
+    if (!ss_tooltips) return;
+

     if (flag)
     if (flag)

-        gtk_tooltips_enable( m_tooltips );
+        gtk_tooltips_enable( ss_tooltips );

     else
     else

-        gtk_tooltips_disable( m_tooltips );
+        gtk_tooltips_disable( ss_tooltips );

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

-    if (!Ok()) return;
-    
-    gtk_tooltips_set_delay( m_tooltips, msecs );
+    if (!ss_tooltips) return;
+
+    gtk_tooltips_set_delay( ss_tooltips, msecs );

 }
 }

+#endif