Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-07-08 14:01:55 -03:00
21 changed files with 177 additions and 48 deletions
+6
View File
@@ -591,6 +591,12 @@ love::image::ImageData *Window::getIcon()
return curMode.icon;
}
void Window::minimize()
{
if (window != nullptr)
SDL_MinimizeWindow(window);
}
void Window::swapBuffers()
{
SDL_GL_SwapWindow(window);
+2
View File
@@ -65,6 +65,8 @@ public:
bool setIcon(love::image::ImageData *imgd);
love::image::ImageData *getIcon();
void minimize();
void swapBuffers();
bool hasFocus() const;