Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-21 22:04:39 -03:00
4 changed files with 18 additions and 28 deletions
+1 -4
View File
@@ -83,9 +83,6 @@ public:
bool isVisible() const;
void setMouseVisible(bool visible);
bool getMouseVisible() const;
void setMouseGrab(bool grab);
bool isMouseGrabbed() const;
@@ -126,7 +123,7 @@ private:
bool createWindowAndContext(int x, int y, int w, int h, Uint32 windowflags, int msaa);
// Update the saved window settings based on the window's actual state.
void updateSettings(const WindowSettings &newsettings);
void updateSettings(const WindowSettings &newsettings, bool updateGraphicsViewport);
SDL_MessageBoxFlags convertMessageBoxType(MessageBoxType type) const;