diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-10-31 22:44:15 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-10-31 22:44:15 -0400 |
| commit | 0411cc5620469bfa76006448f87e9cbabdf5e2ad (patch) | |
| tree | 17e45bb0ddbe9cd597159ee86bfbe983ac4d7e68 /gdk/x11/gdkvisual-x11.c | |
| parent | 727aa6cb08f15ee2ee98851b0f4db0cdc44771c1 (diff) | |
| download | gtk+-0411cc5620469bfa76006448f87e9cbabdf5e2ad.tar.gz | |
Drop GdkVisual
This type was unused except for serving as a parent
for GdkX11Visual. Just move the fields to that type.
Diffstat (limited to 'gdk/x11/gdkvisual-x11.c')
| -rw-r--r-- | gdk/x11/gdkvisual-x11.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 56654e2226..ebb54c9c27 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -24,26 +24,19 @@ #include "config.h" -#include "gdkvisualprivate.h" #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" +#include "gdkvisual-x11.h" #include <X11/Xlib.h> #include <X11/Xutil.h> -struct _GdkX11Visual -{ - GdkVisual visual; - - Visual *xvisual; -}; - struct _GdkX11VisualClass { - GdkVisualClass visual_class; + GObjectClass parent_class; }; -G_DEFINE_TYPE (GdkX11Visual, gdk_x11_visual, GDK_TYPE_VISUAL) +G_DEFINE_TYPE (GdkX11Visual, gdk_x11_visual, G_TYPE_OBJECT) static void gdk_x11_visual_init (GdkX11Visual *x11_visual) @@ -73,9 +66,9 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen, GdkX11Screen *x11_screen; XVisualInfo *visual_list; XVisualInfo visual_template; - GdkVisual *temp_visual; + GdkX11Visual *temp_visual; Visual *default_xvisual; - GdkVisual **visuals; + GdkX11Visual **visuals; int nxvisuals; int nvisuals; int i, j; @@ -87,7 +80,7 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen, visual_template.screen = x11_screen->screen_num; visual_list = XGetVisualInfo (x11_screen->xdisplay, VisualScreenMask, &visual_template, &nxvisuals); - visuals = g_new (GdkVisual *, nxvisuals); + visuals = g_new (GdkX11Visual *, nxvisuals); for (i = 0; i < nxvisuals; i++) visuals[i] = g_object_new (GDK_TYPE_X11_VISUAL, NULL); @@ -96,8 +89,6 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen, nvisuals = 0; for (i = 0; i < nxvisuals; i++) { - visuals[nvisuals]->screen = screen; - if (visual_list[i].depth >= 1) { #ifdef __cplusplus @@ -306,7 +297,7 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen, * * Since: 2.2 */ -GdkVisual * +GdkX11Visual * gdk_x11_screen_lookup_visual (GdkScreen *screen, VisualID xvisualid) { @@ -331,9 +322,9 @@ gdk_x11_screen_lookup_visual (GdkScreen *screen, * Returns: (transfer none): an Xlib Visual*. **/ Visual * -gdk_x11_visual_get_xvisual (GdkVisual *visual) +gdk_x11_visual_get_xvisual (GdkX11Visual *visual) { - g_return_val_if_fail (GDK_IS_VISUAL (visual), NULL); + g_return_val_if_fail (GDK_IS_X11_VISUAL (visual), NULL); return GDK_X11_VISUAL (visual)->xvisual; } |