Continue renaming window to surface

This renames a lot of arguments, local variables and functions.

7 files changed, 36 insertions, 36 deletions

diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c
index f5359d8318..cc3bc37100 100644
--- a/gdk/quartz/GdkQuartzNSWindow.c
+++ b/gdk/quartz/GdkQuartzNSWindow.c
@@ -34,7 +34,7 @@
 
 -(BOOL)windowShouldClose:(id)sender
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkEvent *event;
 
   event = gdk_event_new (GDK_DELETE);
@@ -49,14 +49,14 @@
 
 -(void)windowWillMiniaturize:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   _gdk_quartz_surface_detach_from_parent (window);
 }
 
 -(void)windowDidMiniaturize:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   gdk_synthesize_surface_state (window, 0, 
 			       GDK_SURFACE_STATE_ICONIFIED);
@@ -64,7 +64,7 @@
 
 -(void)windowDidDeminiaturize:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   _gdk_quartz_surface_attach_to_parent (window);
 
@@ -73,7 +73,7 @@
 
 -(void)windowDidBecomeKey:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   gdk_synthesize_surface_state (window, 0, GDK_SURFACE_STATE_FOCUSED);
   _gdk_quartz_events_update_focus_window (window, TRUE);
@@ -81,7 +81,7 @@
 
 -(void)windowDidResignKey:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   _gdk_quartz_events_update_focus_window (window, FALSE);
   gdk_synthesize_surface_state (window, GDK_SURFACE_STATE_FOCUSED, 0);
@@ -89,7 +89,7 @@
 
 -(void)windowDidBecomeMain:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
 
   if (![self isVisible])
     {
@@ -108,7 +108,7 @@
 {
   GdkSurface *window;
 
-  window = [[self contentView] gdkWindow];
+  window = [[self contentView] gdkSurface];
   _gdk_quartz_surface_did_resign_main (window);
 }
 
@@ -154,7 +154,7 @@
 
 -(void)checkSendEnterNotify
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   /* When a new window has been created, and the mouse
@@ -186,7 +186,7 @@
 
 -(void)windowDidMove:(NSNotification *)aNotification
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkEvent *event;
 
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
@@ -218,7 +218,7 @@
 -(void)windowDidResize:(NSNotification *)aNotification
 {
   NSRect content_rect = [self contentRectForFrameRect:[self frame]];
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkEvent *event;
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
   gboolean maximized = gdk_surface_get_state (window) & GDK_SURFACE_STATE_MAXIMIZED;
@@ -273,7 +273,7 @@
 
 -(BOOL)canBecomeMainWindow
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   switch (impl->type_hint)
@@ -302,7 +302,7 @@
 
 -(BOOL)canBecomeKeyWindow
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   if (!window->accept_focus)
@@ -340,7 +340,7 @@
 
 - (void)showAndMakeKey:(BOOL)makeKey
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   inShowOrHide = YES;
@@ -357,7 +357,7 @@
 
 - (void)hide
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   inShowOrHide = YES;
@@ -369,7 +369,7 @@
 
 - (BOOL)trackManualMove
 {
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
   NSPoint currentLocation;
   NSPoint newOrigin;
@@ -587,7 +587,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   current_context = g_object_new (GDK_TYPE_QUARTZ_DRAG_CONTEXT, NULL);
   update_context_from_dragging_info (sender);
 
-  window = [[self contentView] gdkWindow];
+  window = [[self contentView] gdkSurface];
 
   current_context->display = gdk_surface_get_display (window);
 
@@ -626,7 +626,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   GdkEvent *event;
   
   event = gdk_event_new (GDK_DRAG_LEAVE);
-  event->dnd.window = g_object_ref ([[self contentView] gdkWindow]);
+  event->dnd.window = g_object_ref ([[self contentView] gdkSurface]);
   event->dnd.send_event = FALSE;
   event->dnd.context = g_object_ref (current_context);
   event->dnd.time = GDK_CURRENT_TIME;
@@ -653,7 +653,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   _gdk_quartz_surface_nspoint_to_gdk_xy (screen_point, &gx, &gy);
 
   event = gdk_event_new (GDK_DRAG_MOTION);
-  event->dnd.window = g_object_ref ([[self contentView] gdkWindow]);
+  event->dnd.window = g_object_ref ([[self contentView] gdkSurface]);
   event->dnd.send_event = FALSE;
   event->dnd.context = g_object_ref (current_context);
   event->dnd.time = GDK_CURRENT_TIME;
@@ -681,7 +681,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   _gdk_quartz_surface_nspoint_to_gdk_xy (screen_point, &gx, &gy);
 
   event = gdk_event_new (GDK_DROP_START);
-  event->dnd.window = g_object_ref ([[self contentView] gdkWindow]);
+  event->dnd.window = g_object_ref ([[self contentView] gdkSurface]);
   event->dnd.send_event = FALSE;
   event->dnd.context = g_object_ref (current_context);
   event->dnd.time = GDK_CURRENT_TIME;
@@ -715,7 +715,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   g_assert (_gdk_quartz_drag_source_context != NULL);
 
   event = gdk_event_new (GDK_DROP_FINISHED);
-  event->dnd.window = g_object_ref ([[self contentView] gdkWindow]);
+  event->dnd.window = g_object_ref ([[self contentView] gdkSurface]);
   event->dnd.send_event = FALSE;
   event->dnd.context = g_object_ref (_gdk_quartz_drag_source_context);
 
@@ -772,7 +772,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   is_fullscreen = (([self styleMask] & NSFullScreenWindowMask) != 0);
 
   if (was_fullscreen != is_fullscreen)
-    _gdk_quartz_surface_update_fullscreen_state ([[self contentView] gdkWindow]);
+    _gdk_quartz_surface_update_fullscreen_state ([[self contentView] gdkSurface]);
 }
 
 #endif
@@ -780,7 +780,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
 {
   NSRect rect;
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
 
   /* Allow the window to move up "shadow_top" more than normally allowed
@@ -797,7 +797,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
                         defaultFrame:(NSRect)newFrame
 {
   NSRect screenFrame = [[self screen] visibleFrame];
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
   gboolean maximized = gdk_surface_get_state (window) & GDK_SURFACE_STATE_MAXIMIZED;
 
@@ -811,7 +811,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
                  toFrame:(NSRect)newFrame
 {
 
-  GdkSurface *window = [[self contentView] gdkWindow];
+  GdkSurface *window = [[self contentView] gdkSurface];
   GdkSurfaceImplQuartz *impl = GDK_SURFACE_IMPL_QUARTZ (window->impl);
   gboolean maximized = gdk_surface_get_state (window) & GDK_SURFACE_STATE_MAXIMIZED;
 
diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
index 39d3821406..6e9a8a7f5e 100644
--- a/gdk/quartz/GdkQuartzView.c
+++ b/gdk/quartz/GdkQuartzView.c
@@ -555,7 +555,7 @@
   gdk_surface = window;
 }
 
--(GdkSurface *)gdkWindow
+-(GdkSurface *)gdkSurface
 {
   return gdk_surface;
 }
diff --git a/gdk/quartz/GdkQuartzView.h b/gdk/quartz/GdkQuartzView.h
index 01045dc613..24ce2fd7c3 100644
--- a/gdk/quartz/GdkQuartzView.h
+++ b/gdk/quartz/GdkQuartzView.h
@@ -42,7 +42,7 @@
 }
 
 - (void)setGdkSurface: (GdkSurface *)window;
-- (GdkSurface *)gdkWindow;
+- (GdkSurface *)gdkSurface;
 - (NSTrackingRectTag)trackingRect;
 - (void)setNeedsInvalidateShadow: (BOOL)invalidate;
 
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index b1109b0bc3..f9178c3172 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -424,7 +424,7 @@ get_toplevel_from_ns_event (NSEvent *nsevent,
 
       view = (GdkQuartzView *)[[nsevent window] contentView];
 
-      toplevel = [view gdkWindow];
+      toplevel = [view gdkSurface];
 
       point = [nsevent locationInWindow];
       view_point = [view convertPoint:point fromView:nil];
@@ -643,7 +643,7 @@ find_toplevel_for_keyboard_event (NSEvent *nsevent)
   GdkSeat *seat;
 
   view = (GdkQuartzView *)[[nsevent window] contentView];
-  window = [view gdkWindow];
+  window = [view gdkSurface];
 
   display = gdk_surface_get_display (window);
 
diff --git a/gdk/quartz/gdksurface-quartz.c b/gdk/quartz/gdksurface-quartz.c
index 915edff0a0..73ef9ca422 100644
--- a/gdk/quartz/gdksurface-quartz.c
+++ b/gdk/quartz/gdksurface-quartz.c
@@ -1306,7 +1306,7 @@ update_toplevel_order (void)
       if (![[nswindow contentView] isKindOfClass:[GdkQuartzView class]])
         continue;
 
-      window = [(GdkQuartzView *)[nswindow contentView] gdkWindow];
+      window = [(GdkQuartzView *)[nswindow contentView] gdkSurface];
       toplevels = g_list_prepend (toplevels, window);
     }
 
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 12e754325f..5fa66dd8d9 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -615,7 +615,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
       wcl.style |= CS_OWNDC;
       if (0 == klassTOPLEVEL)
         {
-          wcl.lpszClassName = L"gdkWindowToplevel";
+          wcl.lpszClassName = L"gdkSurfaceToplevel";
 
           ONCE_PER_CLASS ();
           klassTOPLEVEL = RegisterClassExW (&wcl);
@@ -630,7 +630,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
         {
           if (klassTEMPSHADOW == 0)
             {
-              wcl.lpszClassName = L"gdkWindowTempShadow";
+              wcl.lpszClassName = L"gdkSurfaceTempShadow";
               wcl.style |= CS_SAVEBITS;
               wcl.style |= 0x00020000; /* CS_DROPSHADOW */
 
@@ -644,7 +644,7 @@ RegisterGdkClass (GdkSurfaceType wtype, GdkSurfaceTypeHint wtype_hint)
         {
           if (klassTEMP == 0)
             {
-              wcl.lpszClassName = L"gdkWindowTemp";
+              wcl.lpszClassName = L"gdkSurfaceTemp";
               wcl.style |= CS_SAVEBITS;
               ONCE_PER_CLASS ();
               klassTEMP = RegisterClassExW (&wcl);
@@ -2716,7 +2716,7 @@ get_functions_quark ()
   static GQuark quark = 0;
 
   if (!quark)
-    quark = g_quark_from_static_string ("gdk-window-functions");
+    quark = g_quark_from_static_string ("gdk-surface-functions");
 
   return quark;
 }
@@ -3363,7 +3363,7 @@ RegisterGdkDumbClass ()
   wcl.hbrBackground = NULL;
   wcl.hCursor = LoadCursor (NULL, IDC_ARROW);
   wcl.style |= CS_OWNDC;
-  wcl.lpszClassName = L"gdkWindowDumb";
+  wcl.lpszClassName = L"gdkSurfaceDumb";
 
   if (klassDUMB == 0)
     klassDUMB = RegisterClassExW (&wcl);
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 60da5f2926..d3d3e3f00d 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -4042,7 +4042,7 @@ get_move_resize_data (GdkDisplay *display,
   static GQuark move_resize_quark = 0;
 
   if (!move_resize_quark)
-    move_resize_quark = g_quark_from_static_string ("gdk-window-moveresize");
+    move_resize_quark = g_quark_from_static_string ("gdk-surface-moveresize");
   
   mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark);