Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for 3.14

Browse Source 
Fix some errors and warnings.

Also: disable the backend by default in preparation for merging.
This commit is contained in:
Ryan Lortie
2014-10-22 11:02:08 -05:00
parent 4479ab2422
commit aef86ff873
4 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -341,7 +341,7 @@ if test -z "$backend_set"; then
else
enable_x11_backend=yes
enable_wayland_backend=maybe
enable_mir_backend=maybe
enable_mir_backend=no
fi
fi

8
gdk/mir/gdkmir-private.h
View File

@@ -18,8 +18,6 @@
#ifndef __GDK_PRIVATE_MIR_H__
#define __GDK_PRIVATE_MIR_H__
#include "config.h"
#include "gdkmir.h"
#include "gdkdisplay.h"
#include "gdkscreen.h"
@@ -32,8 +30,10 @@ typedef struct _GdkMirWindowReference GdkMirWindowReference;
typedef struct _GdkMirEventSource GdkMirEventSource;
#define GDK_TYPE_MIR_WINDOW_IMPL (gdk_mir_window_impl_get_type ())
#define GDK_MIR_WINDOW_IMPL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW_IMPL_MIR, GdkMirWindowImpl))
#define GDK_IS_WINDOW_IMPL_MIR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW_IMPL_MIR))
#define GDK_MIR_WINDOW_IMPL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_MIR_WINDOW_IMPL, GdkMirWindowImpl))
#define GDK_IS_WINDOW_IMPL_MIR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW_IMPL))
GType gdk_mir_window_impl_get_type (void);
GdkDisplay *_gdk_mir_display_open (const gchar *display_name);

1
gdk/mir/gdkmirdisplay.c
View File

@@ -23,6 +23,7 @@
#include "gdkmir.h"
#include "gdkmir-private.h"
#define GDK_TYPE_DISPLAY_MIR (gdk_mir_display_get_type ())
#define GDK_MIR_DISPLAY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MIR, GdkMirDisplay))
#define GDK_MIR_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_MIR, GdkMirDisplayClass))
#define GDK_IS_MIR_DISPLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_DISPLAY))

30
gdk/mir/gdkmirwindowimpl.c
View File

@@ -661,23 +661,6 @@ gdk_mir_window_impl_input_shape_combine_region (GdkWindow *window,
g_printerr ("gdk_mir_window_impl_input_shape_combine_region window=%p\n", window);
}
static gboolean
gdk_mir_window_impl_set_static_gravities (GdkWindow *window,
gboolean use_static)
{
g_printerr ("gdk_mir_window_impl_set_static_gravities window=%p\n", window);
return FALSE;
}
static gboolean
gdk_mir_window_impl_queue_antiexpose (GdkWindow *window,
cairo_region_t *area)
{
//g_printerr ("gdk_mir_window_impl_queue_antiexpose window=%p\n", window);
// FIXME: ?
return FALSE;
}
static void
gdk_mir_window_impl_destroy (GdkWindow *window,
gboolean recursing,
@@ -706,16 +689,6 @@ gdk_mir_window_impl_destroy_foreign (GdkWindow *window)
g_printerr ("gdk_mir_window_impl_destroy_foreign window=%p\n", window);
}
static gboolean
gdk_mir_window_impl_resize_cairo_surface (GdkWindow *window,
cairo_surface_t *surface,
gint width,
gint height)
{
g_printerr ("gdk_mir_window_impl_resize_cairo_surface window=%p\n", window);
return FALSE;
}
static void
gdk_mir_window_impl_focus (GdkWindow *window,
guint32 timestamp)
@@ -1207,11 +1180,8 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
impl_class->get_input_shape = gdk_mir_window_impl_get_input_shape;
impl_class->shape_combine_region = gdk_mir_window_impl_shape_combine_region;
impl_class->input_shape_combine_region = gdk_mir_window_impl_input_shape_combine_region;
impl_class->set_static_gravities = gdk_mir_window_impl_set_static_gravities;
impl_class->queue_antiexpose = gdk_mir_window_impl_queue_antiexpose;
impl_class->destroy = gdk_mir_window_impl_destroy;
impl_class->destroy_foreign = gdk_mir_window_impl_destroy_foreign;
impl_class->resize_cairo_surface = gdk_mir_window_impl_resize_cairo_surface;
impl_class->focus = gdk_mir_window_impl_focus;
impl_class->set_type_hint = gdk_mir_window_impl_set_type_hint;
impl_class->get_type_hint = gdk_mir_window_impl_get_type_hint;