summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorsteve <steve@relm.local>2015-03-23 22:07:03 -0700
committersteve <steve@relm.local>2015-03-23 22:07:03 -0700
commita6f6bd85f982f7b24b71238de302bc534e3d4658 (patch)
treeaf16adefea04bc096855c267933b04943d97a0f6 /platform
parentf35315fee24ade08a48451a6a596df60fa5ea9cb (diff)
fixed build error on OSX from new WM code
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/os_osx.h2
-rw-r--r--platform/osx/os_osx.mm4
2 files changed, 6 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 24f7115938..8f121b7dd5 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -133,6 +133,8 @@ public:
virtual Point2 get_mouse_pos() const;
virtual int get_mouse_button_state() const;
virtual void set_window_title(const String& p_title);
+
+ virtual Size2 get_window_size() const;
virtual void set_icon(const Image& p_icon);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 1c0d1f9991..55ef6c1516 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1245,6 +1245,10 @@ void OS_OSX::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) cons
}
+Size2 OS_OSX::get_window_size() const {
+ return Vector2(current_videomode.width, current_videomode.height);
+}
+
void OS_OSX::move_window_to_foreground() {
[window_object orderFrontRegardless];