projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...
[wxWidgets.git]
/
src
/
gtk1
/
tooltip.cpp
diff --git
a/src/gtk1/tooltip.cpp
b/src/gtk1/tooltip.cpp
index 0ac2a8b1da30316c629e5ad7f499d15227105a3e..bf98adb334f135d2dc4a5d803d022aef61198fb3 100644
(file)
--- a/
src/gtk1/tooltip.cpp
+++ b/
src/gtk1/tooltip.cpp
@@
-13,7
+13,10
@@
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/window.h"
+#endif
#include "wx/gtk1/private.h"
#include "wx/gtk1/private.h"
@@
-21,7
+24,7
@@
// global data
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-static GtkTooltips *ss_tooltips =
(GtkTooltips*)
NULL;
+static GtkTooltips *ss_tooltips = NULL;
//-----------------------------------------------------------------------------
// wxToolTip
//-----------------------------------------------------------------------------
// wxToolTip
@@
-32,7
+35,7
@@
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 )
}
void wxToolTip::SetTip( const wxString &tip )
@@
-52,8
+55,8
@@
void wxToolTip::Apply( wxWindow *win )
m_window = win;
m_window = win;
- if (m_text.
IsE
mpty())
- m_window->ApplyToolTip( ss_tooltips,
(wxChar*)
NULL );
+ if (m_text.
e
mpty())
+ m_window->ApplyToolTip( ss_tooltips, NULL );
else
m_window->ApplyToolTip( ss_tooltips, m_text );
}
else
m_window->ApplyToolTip( ss_tooltips, m_text );
}
@@
-76,4
+79,12
@@
void wxToolTip::SetDelay( long msecs )
gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
}
gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
}
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
#endif
#endif