livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A bit of cleanup and make the return of showAlert match the OSBTN return types in llwindow.h.

meow-7.2.2
Geenz 2013-07-11 21:46:10 -04:00
parent a787e272c3
commit 2f680eec93
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llwindow/llwindowmacosx-objc.mm
View File

@ -418,13 +418,22 @@ long showAlert(std::string text, std::string title, int type)
if (ret == NSAlertFirstButtonReturn)
{
ret = 0;
if (type == 1)
{
ret = 3;
} else if (type == 2)
{
ret = 0;
}
} else if (ret == NSAlertSecondButtonReturn)
{
ret = 1;
} else if (ret == NSAlertThirdButtonReturn)
{
ret = 2;
if (type == 0 || type == 1)
{
ret = 2;
} else if (type == 2)
{
ret = 1;
}
}
return ret;

8
indra/llwindow/llwindowmacosx.cpp
View File

@ -164,7 +164,6 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
// Stash an object pointer for OSMessageBox()
gWindowImplementation = this;
// Create the GL context and set it up for windowed or fullscreen, as appropriate.
LL_INFOS("Window") << "Creating context..." << LL_ENDL;
if(createContext(x, y, width, height, 32, fullscreen, disable_vsync))
{
if(mWindow != NULL)
@ -526,13 +525,11 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
if (mWindow == NULL)
{
LL_INFOS("Window") << "Creating window..." << LL_ENDL;
mWindow = getMainAppWindow();
}
if(mContext == NULL)
{
LL_INFOS("Window") << "Creating GL view..." << LL_ENDL;
// Our OpenGL view is already defined within SecondLife.xib.
// Get the view instead.
mGLView = createOpenGLView(mWindow, mFSAASamples, !disable_vsync);
@ -565,12 +562,10 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
GLint frames_per_swap = 0;
if (disable_vsync)
{
LL_DEBUGS("GLInit") << "Disabling vertical sync" << LL_ENDL;
frames_per_swap = 0;
}
else
{
LL_DEBUGS("GLinit") << "Keeping vertical sync" << LL_ENDL;
frames_per_swap = 1;
}
@ -593,9 +588,8 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
LL_DEBUGS("GLInit") << "Multi-threaded OpenGL enabled." << LL_ENDL;
}
}
LL_INFOS("Window") << "Completed context creation." << LL_ENDL;
makeFirstResponder(mWindow, mGLView);
// Don't need to get the current gamma, since there's a call that restores it to the system defaults.
return TRUE;
}