From 3407a2e14522151ffcfa0f776323df4516d67af7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Sep 2013 13:14:09 +0000 Subject: name cocoa functions in keeping with convention with similar functions for other ghost classes. --- intern/ghost/intern/GHOST_SystemCocoa.mm | 2 +- intern/ghost/intern/GHOST_WindowCocoa.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 684d4e1b832..013d1e09066 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1026,7 +1026,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType, switch (eventType) { case GHOST_kEventWindowClose: // check for index 1 and discard close for mainwindow as it would quit blender without dialog - if ([windowsList count] > 1 && (window->get_m_window() != [windowsList objectAtIndex:1])) { + if ([windowsList count] > 1 && (window->getCocoaWindow() != [windowsList objectAtIndex:1])) { pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) ); } else { diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h index 6787d007ac7..28a463c47f4 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.h +++ b/intern/ghost/intern/GHOST_WindowCocoa.h @@ -271,7 +271,7 @@ public: GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;} /** public function to get the window containing the OpenGL view */ - CocoaWindow *get_m_window() const {return m_window;}; + CocoaWindow *getCocoaWindow() const {return m_window;}; protected: /** -- cgit v1.2.3