quartz: rename GdkQuartzWindow to GdkQuartzNSWindow

diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c
index 22ad990269e65e6f16b328581be1e73eec91f2a1..8edddfd96cea662f019b57cf3213ac6282aa62dc 100644 (file)
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzWindow.c
@@ -22,7 +22,7 @@
 #include "gdkwindow-quartz.h"
 #include "gdkprivate-quartz.h"
 
-@implementation GdkQuartzWindow
+@implementation GdkQuartzNSWindow
 
 -(BOOL)windowShouldClose:(id)sender
 {

diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzWindow.h
index e6d1b4e155eb4ba80b846034c62eb19b932f7eac..0c7e6a26f7e19087e073a66ba3cac769acbe3687 100644 (file)
--- a/gdk/quartz/GdkQuartzWindow.h
+++ b/gdk/quartz/GdkQuartzWindow.h
@@ -22,7 +22,7 @@
 #import <Foundation/Foundation.h>
 #include <glib.h>
 
-@interface GdkQuartzWindow : NSWindow {
+@interface GdkQuartzNSWindow : NSWindow {
   BOOL    inMove;
   BOOL    inShowOrHide;
 

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index a17e6ad5ef11008997967d5a315dc3041076d081..33719b3a88e509aa9842eed363cf3032dfa8d3fc 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -379,7 +379,7 @@ _gdk_quartz_events_update_focus_window (GdkWindow *window,
   if (got_focus && window == current_keyboard_window)
     return;
 
-  /* FIXME: Don't do this when grabbed? Or make GdkQuartzWindow
+  /* FIXME: Don't do this when grabbed? Or make GdkQuartzNSWindow
    * disallow it in the first place instead?
    */
   
@@ -1140,7 +1140,7 @@ gdk_event_translate (GdkEvent *event,
    * dragged. This is a workaround for the window getting events for
    * the window title.
    */
-  if ([(GdkQuartzWindow *)nswindow isInMove])
+  if ([(GdkQuartzNSWindow *)nswindow isInMove])
     {
       break_all_grabs (get_time_from_ns_event (nsevent));
       return FALSE;

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index aab6c3c79bf25f57d7e4843c332c0fb83b104f2d..6b85ef5d65a35ca58878abd946aec1b6c24ca5fe 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -927,11 +927,11 @@ _gdk_quartz_display_create_window_impl (GdkDisplay    *display,
                           NSResizableWindowMask);
           }
 
-       impl->toplevel = [[GdkQuartzWindow alloc] initWithContentRect:content_rect 
-                                                           styleMask:style_mask
-                                                             backing:NSBackingStoreBuffered
-                                                               defer:NO
-                                                                screen:screen];
+       impl->toplevel = [[GdkQuartzNSWindow alloc] initWithContentRect:content_rect 
+                                                             styleMask:style_mask
+                                                               backing:NSBackingStoreBuffered
+                                                                 defer:NO
+                                                                  screen:screen];
 
        if (attributes_mask & GDK_WA_TITLE)
          title = attributes->title;
@@ -1146,7 +1146,7 @@ gdk_window_quartz_show (GdkWindow *window, gboolean already_mapped)
       make_key = (window->accept_focus && focus_on_map &&
                   window->window_type != GDK_WINDOW_TEMP);
 
-      [(GdkQuartzWindow*)impl->toplevel showAndMakeKey:make_key];
+      [(GdkQuartzNSWindow*)impl->toplevel showAndMakeKey:make_key];
       clear_toplevel_order ();
 
       _gdk_quartz_events_send_map_event (window);
@@ -1243,7 +1243,7 @@ gdk_window_quartz_hide (GdkWindow *window)
       if (impl->transient_for)
         _gdk_quartz_window_detach_from_parent (window);
 
-      [(GdkQuartzWindow*)impl->toplevel hide];
+      [(GdkQuartzNSWindow*)impl->toplevel hide];
     }
   else if (impl->view)
     {
@@ -2408,7 +2408,7 @@ gdk_quartz_window_begin_resize_drag (GdkWindow     *window,
       return;
     }
 
-  [(GdkQuartzWindow *)impl->toplevel beginManualResize];
+  [(GdkQuartzNSWindow *)impl->toplevel beginManualResize];
 }
 
 static void
@@ -2432,7 +2432,7 @@ gdk_quartz_window_begin_move_drag (GdkWindow *window,
       return;
     }
 
-  [(GdkQuartzWindow *)impl->toplevel beginManualMove];
+  [(GdkQuartzNSWindow *)impl->toplevel beginManualMove];
 }
 
 static void