X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fguicast%2Fbcwindowbase.h;h=f2314753599f6a11beb3d63cd40cc9d76ac39b5f;hb=0c9155dd01b6745f908e12c6a202c671a8f09514;hp=332c32d740c534fb8dcfb2602f9af3db13cb6f6b;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/guicast/bcwindowbase.h b/cinelerra-5.0/guicast/bcwindowbase.h
index 332c32d7..f2314753 100644
--- a/cinelerra-5.0/guicast/bcwindowbase.h
+++ b/cinelerra-5.0/guicast/bcwindowbase.h
@@ -61,7 +61,6 @@
 #include "bcpopupmenu.inc"
 #include "bcpot.inc"
 #include "bcprogress.inc"
-#include "bcrelocatablewidget.h"
 #include "bcrepeater.inc"
 #include "bcresources.inc"
 #include "bcscrollbar.inc"
@@ -73,7 +72,6 @@
 #include "bctitle.inc"
 #include "bctoggle.inc"
 #include "bctumble.inc"
-#include "bcwidgetgrid.inc"
 #include "bcwindow.inc"
 #include "bcwindowbase.inc"
 #include "bcwindowevents.inc"
@@ -132,7 +130,7 @@ public:
 
 
 // Windows, subwindows, popupwindows inherit from this
-class BC_WindowBase : public BC_RelocatableWidget
+class BC_WindowBase
 {
 public:
 	BC_WindowBase(int opts=0);
@@ -218,8 +216,8 @@ public:
 	int get_color(int64_t color);
 // return the currently selected color
 	int64_t get_color();
-	int show_window(int flush = 1);
-	int hide_window(int flush = 1);
+	virtual int show_window(int flush = 1);
+	virtual int hide_window(int flush = 1);
 	int get_hidden();
 	int get_video_on();
 // Shouldn't deference a pointer to delete a window if a parent is
@@ -258,7 +256,6 @@ public:
 	BC_MenuBar* add_menubar(BC_MenuBar *menu_bar);
 	BC_WindowBase* add_subwindow(BC_WindowBase *subwindow);
 	BC_WindowBase* add_tool(BC_WindowBase *subwindow);
-	BC_WidgetGrid* add_widgetgrid(BC_WidgetGrid *widgetgrid);
 
 // Use this to get events for the popup window.
 // Events are not propagated to the popup window.
@@ -278,7 +275,6 @@ public:
 	virtual int get_h();
 	virtual int get_x();
 	virtual int get_y();
-	virtual int reposition_widgets(){ printf("foo1"); return 0; }
 	int get_root_w(int lock_display);
 	int get_root_h(int lock_display);
 	XineramaScreenInfo *get_xinerama_info(int screen);
@@ -447,6 +443,7 @@ public:
 	void set_inverse();
 	void set_background(VFrame *bitmap);
 // Change the window title.
+	void put_title(const char *text);
 	void set_title(const char *text);
 	const char *get_title();
 	void set_utf8title(const char *text);
@@ -496,7 +493,6 @@ public:
 	int reposition_window(int x, int y, int w, int h);
 	int reposition_window_relative(int dx, int dy);
 	int reposition_window_relative(int dx, int dy, int w, int h);
-	int reposition_widget(int x, int y, int w, int h);
 // Cause a repeat event to be dispatched every duration.
 // duration is milliseconds
 	int set_repeat(int64_t duration);
@@ -624,7 +620,6 @@ private:
 // list of window bases in this window
 	BC_SubWindowList* subwindows;
 // list of window bases in this window
-	BC_WidgetGridList* widgetgrids;
 	ArrayList<BC_WindowBase*> popups;
 // Position of window
 	int x, y, w, h;