Fix generic wxDataViewCtrl Enter handling to conform to Windows UI.

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 3b04c2c35d1e72c0d9e090af5b32c5cd3ed62fd3..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$
@@ -10,20 +10,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/setup.h"
-
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
-#include "wx/window.h"
 
-#include "wx/gtk/private.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *ss_tooltips = NULL;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -34,7 +35,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
-    m_window = (wxWindow*) NULL;
+    m_window = NULL;
 }
 
 void wxToolTip::SetTip( const wxString &tip )
@@ -54,8 +55,8 @@ void wxToolTip::Apply( wxWindow *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 );
 }
@@ -78,5 +79,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
 
-#endif
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
 
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
+#endif