diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-29 17:14:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-29 17:14:09 +0400 |
| commit | 3407a2e14522151ffcfa0f776323df4516d67af7 (patch) | |
| tree | 1447a367f7310075969862d5b5fd6f530d3bb576 /intern/ghost | |
| parent | d528b4c9bb2df88332c719481e62ba6a777f8ec9 (diff) | |
name cocoa functions in keeping with convention with similar functions for other ghost classes.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.h | 2 |
2 files changed, 2 insertions, 2 deletions
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: /** |