luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.GTK3]

Browse source 
* BUG: Fix GTK+3 compilation.


git-svn-id: svn://localhost/gambas/trunk@6038 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2013-12-30 11:46:01 +00:00
parent b3acb379f4
commit 184b1a2898
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gb.gtk/src/gdesktop.cpp
View file

@ -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);
}

2
gb.gtk/src/gtools.cpp
View file

@ -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
};

2
gb.gtk/src/gtools.h
View file

@ -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