Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-02-24 17:51:12 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-02-24 17:51:12 +0400
commit610017d0e8c08010a35f92ab4169d8590dcf9f1c (patch)
tree328e97626f1c141a2176fc32f752467ecb421c72 /intern/ghost
parent92a77d3f0b3166bbcc20b4171144b97d67670a35 (diff)
Add bogus stabs for fullscreen window mode for BGE in GHOST. Platform maintainers should change these to replicate X11 behaviour. Also moved X11 implementation to public methods, just like the IWindow interface. Should fix compilation
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_WindowCarbon.h5
-rw-r--r--intern/ghost/intern/GHOST_WindowCocoa.h4
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.h4
-rw-r--r--intern/ghost/intern/GHOST_WindowX11.h10
4 files changed, 17 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCarbon.h b/intern/ghost/intern/GHOST_WindowCarbon.h
index d25d57156f6..37dc4f5c092 100644
--- a/intern/ghost/intern/GHOST_WindowCarbon.h
+++ b/intern/ghost/intern/GHOST_WindowCarbon.h
@@ -220,6 +220,11 @@ public:
{
return m_tablet;
}
+
+ GHOST_TSuccess beginFullScreen() const {};
+
+ GHOST_TSuccess endFullScreen() const {};
+
protected:
/**
* Tries to install a rendering context in this window.
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h
index f1388c0b466..46f0cab2553 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.h
@@ -266,6 +266,10 @@ public:
virtual void setNativePixelSize(void);
+ GHOST_TSuccess beginFullScreen() const {};
+
+ GHOST_TSuccess endFullScreen() const {};
+
protected:
/**
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index 7f50d58ce35..5daa38a4e4c 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -276,6 +276,10 @@ public:
void processWin32TabletEvent(WPARAM wParam, LPARAM lParam);
void bringTabletContextToFront();
+ GHOST_TSuccess beginFullScreen() const {};
+
+ GHOST_TSuccess endFullScreen() const {};
+
protected:
GHOST_TSuccess initMultisample(PIXELFORMATDESCRIPTOR pfd);
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h
index c009512a831..b8471b41a11 100644
--- a/intern/ghost/intern/GHOST_WindowX11.h
+++ b/intern/ghost/intern/GHOST_WindowX11.h
@@ -231,6 +231,10 @@ public:
bool m_post_init;
GHOST_TWindowState m_post_state;
+ GHOST_TSuccess beginFullScreen() const;
+
+ GHOST_TSuccess endFullScreen() const;
+
protected:
/**
* Tries to install a rendering context in this window.
@@ -309,12 +313,6 @@ protected:
int bg_color
);
- GHOST_TSuccess
- beginFullScreen() const;
-
- GHOST_TSuccess
- endFullScreen() const;
-
private:
/// Force use of public constructor.