summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-04-27 12:20:13 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-04-27 12:34:07 +0200
commite112ac81d1c3a91d46ea660ac4e01e6c94ee900e (patch)
tree284226e20c4c25d0b1d04fc0fc4056aa66ffff33 /include
parentb5529c8c457f442bfc43305becc0c02d6a09ee80 (diff)
First try to render OpenGL content in a window
Change-Id: Ibb7178330d356806cea2cfc972b361167d5a9340
Diffstat (limited to 'include')
-rw-r--r--include/vcl/opengl/OpenGLContext.hxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index b01e8fd352a1..9d22ae6691ef 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -147,6 +147,10 @@ public:
~OpenGLContext();
bool init(Window* pParent = 0);
+ bool init(SystemChildWindow* pChildWindow);
+
+ void swapBuffers();
+
void setWinSize(const Size& rSize);
GLWindow& getOpenGLWindow();
@@ -161,11 +165,13 @@ public:
private:
SAL_DLLPRIVATE bool initWindow();
+ SAL_DLLPRIVATE bool ImplInit();
GLWindow m_aGLWin;
boost::scoped_ptr<Window> m_pWindow;
Window* mpWindow; //points to m_pWindow or the parent window, don't delete it
- boost::scoped_ptr<SystemChildWindow> m_pChildWindow;
+ SystemChildWindow* m_pChildWindow;
+ boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC;
bool mbInitialized;
};