add wxSize overloads to wxBitmap ctors and to wxBitmap::Create

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index a02aedd620a83c10796f72b26b67d30f3a3198cb..801ae68eeddee689b0f7f488edb11692425e742b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -24,7 +24,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *gs_tooltips = NULL;

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


@@ -35,16 +35,16 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;

-    m_window = (wxWindow*) NULL;
+    m_window = NULL;

 }
 
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;
 }
 
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;

-    Apply( m_window );
+    GTKApply( m_window );

 }
 
 }
 

-void wxToolTip::Apply( wxWindow *win )
+void wxToolTip::GTKApply( wxWindow *win )

 {
     if (!win)
         return;
 {
     if (!win)
         return;


@@ -55,13 +55,13 @@ void wxToolTip::Apply( wxWindow *win )
     m_window = win;
 
     if (m_text.empty())
     m_window = win;
 
     if (m_text.empty())

-        m_window->ApplyToolTip( gs_tooltips, NULL );
+        m_window->GTKApplyToolTip( gs_tooltips, NULL );

     else
     else

-        m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+        m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );

 }
 
 /* static */
 }
 
 /* static */

-void wxToolTip::Apply(GtkWidget *w, const gchar *tip)
+void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip)

 {
     if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();
 {
     if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();


@@ -95,4 +95,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 

+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+

 #endif // wxUSE_TOOLTIPS
 #endif // wxUSE_TOOLTIPS