changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal
sample crashes on startup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,8 +18,7 @@
|
||||
#include "wx/window.h"
|
||||
#include "wx/tooltip.h"
|
||||
|
||||
#include "gtk/gtk.h"
|
||||
#include "gdk/gdk.h"
|
||||
#include "wx/gtk/private.h"
|
||||
|
||||
extern GdkFont *GtkGetDefaultGuiFont();
|
||||
|
||||
@@ -67,7 +66,7 @@ void wxToolTip::Apply( wxWindow *win )
|
||||
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 );
|
||||
|
||||
GtkStyle *g_style =
|
||||
@@ -76,11 +75,11 @@ void wxToolTip::Apply( wxWindow *win )
|
||||
|
||||
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 );
|
||||
#else
|
||||
#else // GTK+ 1.0
|
||||
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user