Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

name cocoa functions in keeping with convention with similar functions for other ghost classes.

Browse Source
This commit is contained in:
Campbell Barton
2013-09-29 13:14:09 +00:00
parent d528b4c9bb
commit 3407a2e145
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -1026,7 +1026,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType,
switch (eventType) { switch (eventType) {
case GHOST_kEventWindowClose: case GHOST_kEventWindowClose:
// check for index 1 and discard close for mainwindow as it would quit blender without dialog // 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) ); pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );
} }
else { else {

2
intern/ghost/intern/GHOST_WindowCocoa.h
View File

@@ -271,7 +271,7 @@ public:
GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;} GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;}
/** public function to get the window containing the OpenGL view */ /** 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: protected:
/** /**