sharpetronics/glade
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glade.git synced 2025-11-20 00:03:16 -05:00
Code Issues Projects Releases Wiki Activity

Depend on GTK+ 3.15

Browse Source 
Avoid GTK_CHECK_VERSION ifdefs working around the absense of
gtk_window_get_titlebar().
This commit is contained in:
Tristan Van Berkom 2014-10-23 17:19:34 +09:00
parent a7c536dc3d
commit e4775b6f7a
3 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -145,7 +145,7 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
dnl ================================================================ dnl ================================================================
dnl Check for gtk+ dnl Check for gtk+
dnl ================================================================ dnl ================================================================
GTK_REQUIRED=3.12.0 GTK_REQUIRED=3.15.0
PKG_CHECK_MODULES([GTK],[ PKG_CHECK_MODULES([GTK],[
gtk+-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED
gmodule-2.0 gmodule-2.0

17
plugins/gtk+/glade-gtk-window.c
View File

@ -38,23 +38,6 @@
#define CSD_DISABLED_MESSAGE _("This property does not apply to client-side decorated windows") #define CSD_DISABLED_MESSAGE _("This property does not apply to client-side decorated windows")
#if !GTK_CHECK_VERSION (3,15,0)
static void check_titlebar (GtkWidget *widget, gpointer data)
{
GtkWidget **titlebar = data;
if (gtk_style_context_has_class (gtk_widget_get_style_context (widget), "titlebar"))
*titlebar = widget;
}
static GtkWidget *
gtk_window_get_titlebar (GtkWindow *window)
{
GtkWidget *titlebar = NULL;
gtk_container_forall (GTK_CONTAINER (window), check_titlebar, &titlebar);
return titlebar;
}
#endif
static void static void
glade_gtk_window_parse_finished (GladeProject * project, GObject * object) glade_gtk_window_parse_finished (GladeProject * project, GObject * object)
{ {

18
plugins/gtk+/glade-window-editor.c
View File

@ -194,24 +194,6 @@ icon_file_toggled (GtkWidget *widget,
glade_editable_load (GLADE_EDITABLE (window_editor), gwidget); glade_editable_load (GLADE_EDITABLE (window_editor), gwidget);
} }
#if !GTK_CHECK_VERSION (3,15,0)
/* Hack to find the titlebar */
static void check_titlebar (GtkWidget *widget, gpointer data)
{
GtkWidget **titlebar = data;
if (gtk_style_context_has_class (gtk_widget_get_style_context (widget), "titlebar"))
*titlebar = widget;
}
static GtkWidget *
gtk_window_get_titlebar (GtkWindow *window)
{
GtkWidget *titlebar = NULL;
gtk_container_forall (GTK_CONTAINER (window), check_titlebar, &titlebar);
return titlebar;
}
#endif
static void static void
use_csd_toggled (GtkWidget *widget, use_csd_toggled (GtkWidget *widget,
GladeWindowEditor *window_editor) GladeWindowEditor *window_editor)