mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
b=794285 restore support for building against GTK+ 2.10 r=glandium
--HG-- extra : transplant_source : %D0%2B6%19%96%99%8D%21%F5%5D8%92%FC%1E%1D%BB%B77h%81
This commit is contained in:
parent
6ce22299bc
commit
45af265b62
@ -65,7 +65,7 @@ PYTHON_VERSION_MAJOR=2
|
||||
PYTHON_VERSION_MINOR=5
|
||||
CAIRO_VERSION=1.10
|
||||
PANGO_VERSION=1.14.0
|
||||
GTK2_VERSION=2.18.0
|
||||
GTK2_VERSION=2.10.0
|
||||
WINDRES_VERSION=2.14.90
|
||||
W32API_VERSION=3.14
|
||||
GNOMEVFS_VERSION=2.0
|
||||
|
@ -22,4 +22,12 @@ gdk_window_get_screen(GdkWindow *window)
|
||||
{
|
||||
return gdk_drawable_get_screen (window);
|
||||
}
|
||||
|
||||
#if GDK_PIXBUF_MAJOR == 2 && GDK_PIXBUF_MINOR < 18
|
||||
static inline gboolean
|
||||
gdk_window_is_destroyed(GdkWindow *window)
|
||||
{
|
||||
return GDK_WINDOW_OBJECT(window)->destroyed;
|
||||
}
|
||||
#endif
|
||||
#endif /* GDKWINDOW_WRAPPER_H */
|
||||
|
15
widget/gtk2/compat/gtk/gtkdialog.h
Normal file
15
widget/gtk2/compat/gtk/gtkdialog.h
Normal file
@ -0,0 +1,15 @@
|
||||
#ifndef GTKDIALOG_WRAPPER_H
|
||||
#define GTKDIALOG_WRAPPER_H
|
||||
|
||||
#include_next <gtk/gtkdialog.h>
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 14, 0)
|
||||
static inline GtkWidget *
|
||||
gtk_dialog_get_content_area(GtkDialog *dialog)
|
||||
{
|
||||
return dialog->vbox;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GTKDIALOG_WRAPPER_H */
|
15
widget/gtk2/compat/gtk/gtkplug.h
Normal file
15
widget/gtk2/compat/gtk/gtkplug.h
Normal file
@ -0,0 +1,15 @@
|
||||
#ifndef GTKPLUG_WRAPPER_H
|
||||
#define GTKPLUG_WRAPPER_H
|
||||
|
||||
#include_next <gtk/gtkplug.h>
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 14, 0)
|
||||
static inline GdkWindow *
|
||||
gtk_plug_get_socket_window(GtkPlug *plug)
|
||||
{
|
||||
return plug->socket_window;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GTKPLUG_WRAPPER_H */
|
35
widget/gtk2/compat/gtk/gtkselection.h
Normal file
35
widget/gtk2/compat/gtk/gtkselection.h
Normal file
@ -0,0 +1,35 @@
|
||||
#ifndef GTKSELECTION_WRAPPER_H
|
||||
#define GTKSELECTION_WRAPPER_H
|
||||
|
||||
#include_next <gtk/gtkselection.h>
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 16, 0)
|
||||
static inline GdkAtom
|
||||
gtk_selection_data_get_selection(GtkSelectionData *selection_data)
|
||||
{
|
||||
return selection_data->selection;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 14, 0)
|
||||
static inline const guchar *
|
||||
gtk_selection_data_get_data(GtkSelectionData *selection_data)
|
||||
{
|
||||
return selection_data->data;
|
||||
}
|
||||
|
||||
static inline gint
|
||||
gtk_selection_data_get_length(GtkSelectionData *selection_data)
|
||||
{
|
||||
return selection_data->length;
|
||||
}
|
||||
|
||||
static inline GdkAtom
|
||||
gtk_selection_data_get_target(GtkSelectionData *selection_data)
|
||||
{
|
||||
return selection_data->target;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GTKSELECTION_WRAPPER_H */
|
@ -15,6 +15,8 @@
|
||||
#undef gtk_widget_set_realized
|
||||
#undef gtk_widget_get_realized
|
||||
|
||||
#include <gtk/gtkversion.h>
|
||||
|
||||
static inline void
|
||||
gtk_widget_set_mapped(GtkWidget *widget, gboolean mapped)
|
||||
{
|
||||
@ -44,4 +46,66 @@ gtk_widget_get_realized(GtkWidget *widget)
|
||||
{
|
||||
return GTK_WIDGET_REALIZED (widget);
|
||||
}
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 18, 0)
|
||||
static inline gboolean
|
||||
gtk_widget_get_visible(GtkWidget *widget)
|
||||
{
|
||||
return GTK_WIDGET_VISIBLE(widget);
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
gtk_widget_has_focus(GtkWidget *widget)
|
||||
{
|
||||
return GTK_WIDGET_HAS_FOCUS(widget);
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
gtk_widget_has_grab(GtkWidget *widget)
|
||||
{
|
||||
return GTK_WIDGET_HAS_GRAB(widget);
|
||||
}
|
||||
|
||||
static inline void
|
||||
gtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation)
|
||||
{
|
||||
*allocation = widget->allocation;
|
||||
}
|
||||
|
||||
static inline void
|
||||
gtk_widget_set_allocation(GtkWidget *widget, const GtkAllocation *allocation)
|
||||
{
|
||||
widget->allocation = *allocation;
|
||||
}
|
||||
|
||||
static inline void
|
||||
gtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
|
||||
{
|
||||
if (can_focus)
|
||||
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
|
||||
else
|
||||
GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
|
||||
}
|
||||
|
||||
static inline void
|
||||
gtk_widget_set_window(GtkWidget *widget, GdkWindow *window)
|
||||
{
|
||||
widget->window = window;
|
||||
}
|
||||
|
||||
static inline gboolean
|
||||
gtk_widget_is_toplevel(GtkWidget *widget)
|
||||
{
|
||||
return GTK_WIDGET_TOPLEVEL(widget);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !GTK_CHECK_VERSION(2, 14, 0)
|
||||
static inline GdkWindow*
|
||||
gtk_widget_get_window(GtkWidget *widget)
|
||||
{
|
||||
return widget->window;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GTKWIDGET_WRAPPER_H */
|
||||
|
Loading…
Reference in New Issue
Block a user