diff options
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index ffa1ce00b..ebcb0dc2f 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -159,12 +159,12 @@ class OS_X11 : public OS_Unix { int joystick_count; Joystick joysticks[JOYSTICKS_MAX]; -#ifdef NEW_WM_API + unsigned int capture_idle; bool maximized; //void set_wm_border(bool p_enabled); void set_wm_fullscreen(bool p_enabled); -#endif + protected: @@ -220,25 +220,25 @@ public: virtual VideoMode get_video_mode(int p_screen=0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const; -#ifdef NEW_WM_API + virtual int get_screen_count() const; - virtual int get_screen() const; - virtual void set_screen(int p_screen); + virtual int get_current_screen() const; + virtual void set_current_screen(int p_screen); virtual Point2 get_screen_position(int p_screen=0) const; virtual Size2 get_screen_size(int p_screen=0) const; virtual Point2 get_window_position() const; virtual void set_window_position(const Point2& p_position); virtual Size2 get_window_size() const; virtual void set_window_size(const Size2 p_size); - virtual void set_fullscreen(bool p_enabled); - virtual bool is_fullscreen() const; - virtual void set_resizable(bool p_enabled); - virtual bool is_resizable() const; - virtual void set_minimized(bool p_enabled); - virtual bool is_minimized() const; - virtual void set_maximized(bool p_enabled); - virtual bool is_maximized() const; -#endif + virtual void set_window_fullscreen(bool p_enabled); + virtual bool is_window_fullscreen() const; + virtual void set_window_resizable(bool p_enabled); + virtual bool is_window_resizable() const; + virtual void set_window_minimized(bool p_enabled); + virtual bool is_window_minimized() const; + virtual void set_window_maximized(bool p_enabled); + virtual bool is_window_maximized() const; + virtual void move_window_to_foreground(); void run(); |