info btn, zoom lockup, nesting, paste fixes

[goodguy/history.git] / cinelerra-5.1 / guicast / bcwindowbase.C

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 8322837d3302ef1f39378a45bc1225d417007518..96e71f39ee3bfe27e3f7a03e6a158540df13ccfd 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -113,8 +113,9 @@ BC_WindowBase::~BC_WindowBase()
 // stop event input
                XSelectInput(top_level->display, this->win, 0);
                motion_events = resize_events = translation_events = 0;
+#ifndef SINGLE_THREAD
                top_level->dequeue_events(win);
-
+#endif
                if(top_level->active_menubar == this) top_level->active_menubar = 0;
                if(top_level->active_popup_menu == this) top_level->active_popup_menu = 0;
                if(top_level->active_subwindow == this) top_level->active_subwindow = 0;
@@ -887,7 +888,7 @@ int BC_WindowBase::keysym_lookup(XEvent *event)
        return ret;
 }
 
-pthread_t locking_task = -1;
+pthread_t locking_task = (pthread_t)-1L;
 int locking_event = -1;
 int locking_message = -1;
 
@@ -1950,6 +1951,7 @@ int BC_WindowBase::recieve_custom_xatoms(xatom_event *event)
 
 int BC_WindowBase::send_custom_xatom(xatom_event *event)
 {
+#ifndef SINGLE_THREAD
        XEvent *myevent = new_xevent();
        XClientMessageEvent *ptr = (XClientMessageEvent*)myevent;
        ptr->type = ClientMessage;
@@ -1962,6 +1964,7 @@ int BC_WindowBase::send_custom_xatom(xatom_event *event)
        ptr->data.l[4] = event->data.l[4];
 
        put_event(myevent);
+#endif
        return 0;
 }
 
@@ -3325,8 +3328,8 @@ void BC_WindowBase::set_done(int return_value)
 // it is deleted.
 // Deletion of event_thread is done at the end of BC_WindowBase::run_window() - by calling the destructor
                put_event(event);
-       }
 #endif
+       }
 }
 
 void BC_WindowBase::close(int return_value)