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

gdk: remove "screen" member from GdkOffscreenWindow, it has become obsolete

Browse Source 
Also remove screen parameter from _gdk_offscreen_window_new() and get
rid of a bunch on includes in gdkoffscreenwindow.c
This commit is contained in:
Michael Natterer 2010-09-28 16:03:59 +02:00
parent f51f39af2a
commit 06773b1e8b
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/gdkinternals.h
View File

@ -552,7 +552,6 @@ GdkWindow *_gdk_window_get_input_window_for_event (GdkWindow *native_window,
*****************************/
GType gdk_offscreen_window_get_type (void);
void _gdk_offscreen_window_new (GdkWindow *window,
GdkScreen *screen,
GdkWindowAttr *attributes,
gint attributes_mask);

13
gdk/gdkoffscreenwindow.c
View File

@ -24,16 +24,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include <config.h>
#include "config.h"
#include <math.h>
#include "gdk.h"
#include "gdkwindow.h"
#include "gdkinternals.h"
#include "gdkwindowimpl.h"
#include "gdkdrawable.h"
#include "gdktypes.h"
#include "gdkscreen.h"
#include "gdkcolor.h"
/* LIMITATIONS:
@ -51,7 +48,6 @@ struct _GdkOffscreenWindow
GdkDrawable parent_instance;
GdkWindow *wrapper;
GdkScreen *screen;
cairo_surface_t *surface;
GdkWindow *embedder;
@ -138,7 +134,6 @@ gdk_offscreen_window_ref_cairo_surface (GdkDrawable *drawable)
void
_gdk_offscreen_window_new (GdkWindow *window,
GdkScreen *screen,
GdkWindowAttr *attributes,
gint attributes_mask)
{
@ -159,8 +154,6 @@ _gdk_offscreen_window_new (GdkWindow *window,
offscreen = GDK_OFFSCREEN_WINDOW (private->impl);
offscreen->wrapper = window;
offscreen->screen = screen;
offscreen->surface = gdk_window_create_similar_surface ((GdkWindow *)private->parent,
CAIRO_CONTENT_COLOR,
private->width,

2
gdk/gdkwindow.c
View File

@ -1386,7 +1386,7 @@ gdk_window_new (GdkWindow *parent,
if (gdk_window_is_offscreen (private))
{
_gdk_offscreen_window_new (window, screen, attributes, attributes_mask);
_gdk_offscreen_window_new (window, attributes, attributes_mask);
private->impl_window = private;
}
else if (native)