summaryrefslogtreecommitdiff
path: root/plugingui/window.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-03-12 10:54:52 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2016-03-12 10:54:52 +0100
commitb9773f6eecea38e6a5aa28745cc6fe79aa2d441f (patch)
tree3740949c67bb6bfe533b35974f230c0443ce2c57 /plugingui/window.cc
parent4bda33e204fafc4fdee6d14d5167ca7a801400ae (diff)
Add parent widget pointer for contained plugin windows. Remove threaded event handling and make all event handling depend on processEcvents being called with a regular (~50ms) interval.
Diffstat (limited to 'plugingui/window.cc')
-rw-r--r--plugingui/window.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugingui/window.cc b/plugingui/window.cc
index ab51008..e61b004 100644
--- a/plugingui/window.cc
+++ b/plugingui/window.cc
@@ -42,7 +42,7 @@
namespace GUI {
-Window::Window()
+Window::Window(void* native_window)
: Widget(nullptr)
, wpixbuf(100, 100)
{
@@ -52,13 +52,13 @@ Window::Window()
#ifndef PUGL
#ifdef X11
- native = new NativeWindowX11(*this);
+ native = new NativeWindowX11(native_window, *this);
#endif/*X11*/
#ifdef WIN32
- native = new NativeWindowWin32(*this);
+ native = new NativeWindowWin32(native_window, *this);
#endif/*WIN32*/
#else/*Use pugl*/
- native = new NativeWindowPugl(this);
+ native = new NativeWindowPugl(native_window, *this);
#endif
eventhandler = new EventHandler(*native, *this);