Applied patch [ 1776951 ] wxSizer::GetContainingWindow fails for nested sizers

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

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 3b04c2c35d1e72c0d9e090af5b32c5cd3ed62fd3..28d243f78971302bf2ca89d05a6a71c155957626 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,14 +10,15 @@
 // 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
@@ -54,7 +55,7 @@ void wxToolTip::Apply( wxWindow *win )
 
     m_window = win;
 
-    if (m_text.IsEmpty())
+    if (m_text.empty())
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) 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