projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic wxFileName functions seem to work under Windows
[wxWidgets.git]
/
src
/
gtk1
/
tooltip.cpp
diff --git
a/src/gtk1/tooltip.cpp
b/src/gtk1/tooltip.cpp
index 109f4658a68f3b31284c12dc321064b0ed6d2d73..d6577bfb93608eab330d30726d21259a8c80511b 100644
(file)
--- a/
src/gtk1/tooltip.cpp
+++ b/
src/gtk1/tooltip.cpp
@@
-18,8
+18,7
@@
#include "wx/window.h"
#include "wx/tooltip.h"
#include "wx/window.h"
#include "wx/tooltip.h"
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"
extern GdkFont *GtkGetDefaultGuiFont();
extern GdkFont *GtkGetDefaultGuiFont();
@@
-35,6
+34,8
@@
static GdkColor ss_fg;
// wxToolTip
//-----------------------------------------------------------------------------
// wxToolTip
//-----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
wxToolTip::wxToolTip( const wxString &tip )
{
m_text = tip;
wxToolTip::wxToolTip( const wxString &tip )
{
m_text = tip;
@@
-65,20
+66,20
@@
void wxToolTip::Apply( wxWindow *win )
ss_bg.blue = 50000;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
ss_bg.blue = 50000;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
-#if
(GTK_MINOR_VERSION >
0)
+#if
GTK_CHECK_VERSION(1, 2,
0)
gtk_tooltips_force_window( ss_tooltips );
gtk_tooltips_force_window( ss_tooltips );
-
- GtkStyle *g_style =
+
+ GtkStyle *g_style =
gtk_style_copy(
gtk_widget_get_style( ss_tooltips->tip_window ) );
gtk_style_copy(
gtk_widget_get_style( ss_tooltips->tip_window ) );
-
+
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
- gdk_font_unref( g_style->font );
-
g_style->font = gdk_font_ref(
GtkGetDefaultGuiFont() );
-
+
+
SET_STYLE_FONT( g_style,
GtkGetDefaultGuiFont() );
+
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
-#else
+#else
// GTK+ 1.0
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
#endif
}
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
#endif
}