From 184b1a28982f21656fe8219636580cb5ecb2c371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Mon, 30 Dec 2013 11:46:01 +0000 Subject: [PATCH] [GB.GTK3] * BUG: Fix GTK+3 compilation. git-svn-id: svn://localhost/gambas/trunk@6038 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- gb.gtk/src/gdesktop.cpp | 8 ++++---- gb.gtk/src/gtools.cpp | 2 +- gb.gtk/src/gtools.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gb.gtk/src/gdesktop.cpp b/gb.gtk/src/gdesktop.cpp index bb9a6ba25..c9c628179 100644 --- a/gb.gtk/src/gdesktop.cpp +++ b/gb.gtk/src/gdesktop.cpp @@ -111,10 +111,10 @@ static gColor get_color(GType type, gColor default_color, GtkStateFlags state, b if (!st) return default_color; - if (fg) - gtk_style_context_get_color(st, state, &rgba); - else - gtk_style_context_get_background_color(st, state, &rgba); + if (fg) + gtk_style_context_get_color(st, state, &rgba); + else + gtk_style_context_get_background_color(st, state, &rgba); return gt_to_color(&rgba); } diff --git a/gb.gtk/src/gtools.cpp b/gb.gtk/src/gtools.cpp index 706fbfcdd..212564094 100644 --- a/gb.gtk/src/gtools.cpp +++ b/gb.gtk/src/gtools.cpp @@ -1965,7 +1965,7 @@ static int type_to_index(GType type) const char *gt_get_style_class(GType type) { static const char *_class[] = { - GTK_STYLE_CLASS_BUTTON, GTK_STYLE_CLASS_ENTRY, NULL, GTK_STYLE_CLASS_TOOLTIP, + GTK_STYLE_CLASS_BUTTON, GTK_STYLE_CLASS_ENTRY, GTK_STYLE_CLASS_BACKGROUND, GTK_STYLE_CLASS_TOOLTIP, GTK_STYLE_CLASS_SCROLLBAR, NULL, GTK_STYLE_CLASS_CHECK, GTK_STYLE_CLASS_RADIO, GTK_STYLE_CLASS_FRAME, GTK_STYLE_CLASS_BACKGROUND }; diff --git a/gb.gtk/src/gtools.h b/gb.gtk/src/gtools.h index 7f7ba2e07..2921f1de2 100644 --- a/gb.gtk/src/gtools.h +++ b/gb.gtk/src/gtools.h @@ -139,7 +139,7 @@ GtkWidget *gtk_window_group_get_current_grab(GtkWindowGroup *window_group); // Cairo support #if GTK_CHECK_VERSION(3, 10, 0) -#define gt_cairo_create_surface_from_pixbuf gdk_cairo_create_surface_from_pixbuf +#define gt_cairo_create_surface_from_pixbuf gdk_cairo_surface_create_from_pixbuf #else cairo_surface_t *gt_cairo_create_surface_from_pixbuf(const GdkPixbuf *pixbuf); #endif