clip picons as clip_icon.png, vwindow hang, fix for drop target test

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

diff --git a/cinelerra-5.1/guicast/bcwindowbase.h b/cinelerra-5.1/guicast/bcwindowbase.h
index 2c25dc1feb0bdf9fe3a255eee4f9afdbf11ec7a5..82e6d57cea0516b210b822b13c62d56e809c3206 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.h
+++ b/cinelerra-5.1/guicast/bcwindowbase.h
@@ -129,7 +129,7 @@ public:
 class BC_WindowBase : public trace_info
 {
 public:
-       BC_WindowBase(int opts=0);
+       BC_WindowBase();
        virtual ~BC_WindowBase();
 
        friend class BC_Bar;
@@ -282,13 +282,13 @@ public:
        int get_screen_x(int lock_display, int screen);
        int get_screen_y(int lock_display, int screen);
 // Get current position
-       void get_abs_cursor_xy(int &abs_x, int &abs_y, int lock_window=0);
+       void get_abs_cursor(int &abs_x, int &abs_y, int lock_window=0);
        int get_abs_cursor_x(int lock_window=0);
        int get_abs_cursor_y(int lock_window=0);
-       void get_pop_cursor_xy(int &px, int &py, int lock_window=0);
+       void get_pop_cursor(int &px, int &py, int lock_window=0);
        int get_pop_cursor_x(int lock_window=0);
        int get_pop_cursor_y(int lock_window=0);
-       void get_relative_cursor_xy(int &x, int &y, int lock_window=0);
+       void get_relative_cursor(int &x, int &y, int lock_window=0);
        int get_relative_cursor_x(int lock_window=0);
        int get_relative_cursor_y(int lock_window=0);
        void get_root_coordinates(int x, int y, int *abs_x, int *abs_y);
@@ -461,6 +461,7 @@ public:
 // Reroute toplevel events
        int grab(BC_WindowBase *window);
        int ungrab(BC_WindowBase *window);
+       int grab_event_count();
 // Grab button events
        int grab_buttons();
        void ungrab_buttons();
@@ -738,7 +739,6 @@ private:
 // Popup window for tooltip
        BC_Popup *tooltip_popup;
 // If this subwindow has already shown a tooltip since the last EnterNotify
-       int options;
        int flash_enabled;