wxEVT_CREATE appears never to arrive on Windows, so change things

to create the OpenGL thread on the first paint request.

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 6788d03848b936658007eeb75e73cd05fbaffe18..50fdd02987e5d193447b8602adb323628dbc3031 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -74,7 +74,6 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        _canvas = new wxGLCanvas (parent, wxID_ANY, 0, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
        _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::update, this));
        _canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
-       _canvas->Bind (wxEVT_CREATE, boost::bind(&GLVideoView::create, this));
 
        _canvas->Bind (wxEVT_TIMER, boost::bind(&GLVideoView::check_for_butler_errors, this));
        _timer.reset (new wxTimer(_canvas));
@@ -111,6 +110,10 @@ GLVideoView::check_for_butler_errors ()
 void
 GLVideoView::update ()
 {
+       if (!_thread.joinable()) {
+               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
+       }
+
        {
                boost::mutex::scoped_lock lm (_canvas_mutex);
                if (!_canvas->IsShownOnScreen()) {
@@ -414,10 +417,3 @@ GLVideoView::request_one_shot ()
        _thread_work_condition.notify_all ();
 }
 
-void
-GLVideoView::create ()
-{
-       if (!_thread.joinable()) {
-               _thread = boost::thread (boost::bind(&GLVideoView::thread, this));
-       }
-}

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index fcf5dbcf251c890ca38945cc708ebbc945628874..e1a7fc1acdba7b3237b50b163f355c3714b31ba3 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -60,7 +60,6 @@ private:
        void thread ();
        void thread_playing ();
        void request_one_shot ();
-       void create ();
        void check_for_butler_errors ();
 
        /* Mutex for use of _canvas; it's only contended when our ::thread