LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 16:20:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-07-30 01:32:10 -03:00
parent 88211ede8f eaad102f5c
commit aa05664d4c
42 changed files with 640 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/sdl/Window.h
+4 -1
View File
@@ -84,7 +84,8 @@ public:
const void *getHandle() const;
void showMessageBox(MessageBoxType type, const char *title, const char *message);
bool showMessageBox(MessageBoxType type, const std::string &title, const std::string &message, bool attachtowindow);
int showMessageBox(const MessageBoxData &data);
static love::window::Window *createSingleton();
static love::window::Window *getSingleton();
@@ -99,6 +100,8 @@ private:
// Update the saved window settings based on the window's actual state.
void updateSettings(const WindowSettings &newsettings);
SDL_MessageBoxFlags convertMessageBoxType(MessageBoxType type) const;
std::string windowTitle;
struct _currentMode