X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fguicast%2Fbcwindowbase.h;h=af271e49bf82103c6391ecfafe376eae8c140419;hb=ac6cc6b87e596ffb6cc0e3c5b965f99893e70acd;hp=c463820f98ff626122a24b6e505df80136c875d1;hpb=3564c71f425f390745eb7c75d5121689d53e14c2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/guicast/bcwindowbase.h b/cinelerra-5.0/guicast/bcwindowbase.h
index c463820f..af271e49 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);
@@ -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.
@@ -290,6 +287,8 @@ public:
 	int get_abs_cursor_y(int lock_window);
 	int get_relative_cursor_x();
 	int get_relative_cursor_y();
+	void get_root_coordinates(int x, int y, int *abs_x, int *abs_y);
+	void get_win_coordinates(int abs_x, int abs_y, int *x, int *y);
 // Return 1 if cursor is over an unobscured part of this window.
 // An argument is provided for excluding a drag popup
 	int get_cursor_over_window();
@@ -446,6 +445,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);
@@ -495,7 +495,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);
@@ -609,12 +608,8 @@ private:
 	int find_prev_textbox(BC_WindowBase **last_textbox, BC_WindowBase **prev_textbox, int &result);
 
 
-	void translate_coordinates(Window src_w,
-		Window dest_w,
-		int src_x,
-		int src_y,
-		int *dest_x_return,
-		int *dest_y_return);
+	void translate_coordinates(Window src_w, Window dest_w,
+		int src_x, int src_y, int *dest_x_return, int *dest_y_return);
 
 // Top level window above this window
 	BC_WindowBase* top_level;
@@ -623,7 +618,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;