AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Export GdkX11Display

Browse Source
This commit is contained in:
Benjamin Otte 2010-12-20 19:42:53 +01:00 committed by Matthias Clasen
parent 4db086da4b
commit eba4529246
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/x11/gdkdisplay-x11.c
View File

@ -160,13 +160,13 @@ static const char *const precache_atoms[] = {
static char *gdk_sm_client_id;
G_DEFINE_TYPE_WITH_CODE (GdkX11Display, _gdk_x11_display, GDK_TYPE_DISPLAY,
G_DEFINE_TYPE_WITH_CODE (GdkX11Display, gdk_x11_display, GDK_TYPE_DISPLAY,
G_IMPLEMENT_INTERFACE (GDK_TYPE_EVENT_TRANSLATOR,
gdk_x11_display_event_translator_init))
static void
_gdk_x11_display_init (GdkX11Display *display)
gdk_x11_display_init (GdkX11Display *display)
{
_gdk_x11_display_manager_add_display (gdk_display_manager_get (),
GDK_DISPLAY (display));
@ -1737,7 +1737,7 @@ gdk_x11_display_dispose (GObject *object)
display_x11->event_source = NULL;
}
G_OBJECT_CLASS (_gdk_x11_display_parent_class)->dispose (object);
G_OBJECT_CLASS (gdk_x11_display_parent_class)->dispose (object);
}
static void
@ -1810,7 +1810,7 @@ gdk_x11_display_finalize (GObject *object)
g_slice_free (GdkErrorTrap, trap);
}
G_OBJECT_CLASS (_gdk_x11_display_parent_class)->finalize (object);
G_OBJECT_CLASS (gdk_x11_display_parent_class)->finalize (object);
}
/**
@ -2714,7 +2714,7 @@ gdk_x11_display_get_keymap (GdkDisplay *display)
}
static void
_gdk_x11_display_class_init (GdkX11DisplayClass * class)
gdk_x11_display_class_init (GdkX11DisplayClass * class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (class);

9
gdk/x11/gdkdisplay-x11.h
View File

@ -35,14 +35,6 @@
G_BEGIN_DECLS
typedef struct _GdkX11Display GdkX11Display;
typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
#define GDK_TYPE_X11_DISPLAY (_gdk_x11_display_get_type())
#define GDK_X11_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY, GdkX11Display))
#define GDK_X11_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
#define GDK_IS_X11_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY))
#define GDK_X11_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
struct _GdkX11Display
{
@ -148,7 +140,6 @@ struct _GdkX11DisplayClass
GdkDisplayClass parent_class;
};
GType _gdk_x11_display_get_type (void);
GdkScreen *_gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
Window xrootwin);
void _gdk_x11_display_error_event (GdkDisplay *display,

12
gdk/x11/gdkx11display.h
View File

@ -38,7 +38,17 @@
G_BEGIN_DECLS
#define GDK_IS_X11_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), g_type_from_name ("GdkX11Display")))
typedef struct _GdkX11Display GdkX11Display;
typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
#define GDK_TYPE_X11_DISPLAY (gdk_x11_display_get_type())
#define GDK_X11_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY, GdkX11Display))
#define GDK_X11_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
#define GDK_IS_X11_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_DISPLAY))
#define GDK_IS_X11_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY))
#define GDK_X11_DISPLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
GType gdk_x11_display_get_type (void);
Display *gdk_x11_display_get_xdisplay (GdkDisplay *display);