EOL fixes.
parent
b73e03134b
commit
e1072ac2f6
|
|
@ -3003,7 +3003,11 @@ void LLWindowMacOSX::hideCursorUntilMouseMove()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void LLWindowMacOSX::setTitle(const std::string &title)
|
||||
{
|
||||
CFStringRef string = CFStringCreateWithCString(NULL, title.c_str(), kCFStringEncodingUTF8);
|
||||
SetWindowTitleWithCFString(mWindow, string);
|
||||
}
|
||||
|
||||
//
|
||||
// LLSplashScreenMacOSX
|
||||
|
|
|
|||
|
|
@ -112,6 +112,8 @@ public:
|
|||
/*virtual*/ void interruptLanguageTextInput();
|
||||
/*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async);
|
||||
|
||||
/*virtual*/ void setTitle(const std::string& title);
|
||||
|
||||
static std::vector<std::string> getDynamicFallbackFontList();
|
||||
|
||||
// Provide native key event data
|
||||
|
|
|
|||
|
|
@ -414,6 +414,11 @@ static int x11_detect_VRAM_kb()
|
|||
}
|
||||
#endif // LL_X11
|
||||
|
||||
void LLWindowSDL::setTitle(const std::string &title)
|
||||
{
|
||||
SDL_WM_SetCaption(title.c_str(), title.c_str());
|
||||
}
|
||||
|
||||
BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync)
|
||||
{
|
||||
//bool glneedsinit = false;
|
||||
|
|
|
|||
|
|
@ -120,6 +120,8 @@ public:
|
|||
/*virtual*/ void bringToFront();
|
||||
|
||||
/*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async);
|
||||
|
||||
/*virtual*/ void setTitle(const std::string& title);
|
||||
|
||||
static std::vector<std::string> getDynamicFallbackFontList();
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue