AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

quartz: rename GdkQuartzWindow to GdkQuartzNSWindow

Browse Source
This commit is contained in:
Kristian Rietveld 2010-12-22 16:55:56 +01:00
parent c6fad1d2cb
commit 3bc60a8149
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/quartz/GdkQuartzWindow.c
View File

@ -22,7 +22,7 @@
#include "gdkwindow-quartz.h"
#include "gdkprivate-quartz.h"
@implementation GdkQuartzWindow
@implementation GdkQuartzNSWindow
-(BOOL)windowShouldClose:(id)sender
{

2
gdk/quartz/GdkQuartzWindow.h
View File

@ -22,7 +22,7 @@
#import <Foundation/Foundation.h>
#include <glib.h>
@interface GdkQuartzWindow : NSWindow {
@interface GdkQuartzNSWindow : NSWindow {
BOOL inMove;
BOOL inShowOrHide;

4
gdk/quartz/gdkevents-quartz.c
View File

@ -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;

18
gdk/quartz/gdkwindow-quartz.c
View File

@ -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