X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcpopupmenu.h;h=298c6a1d1048fdd24a9c69be42de864a24a73619;hb=853b81c6d430bd41037984ecc95fd304fd98964e;hp=db79d20211d82aab797d50bd18c1e15eb052c292;hpb=a64e7d16c44bba0d137936227fc55871bb26c903;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.h b/cinelerra-5.1/guicast/bcpopupmenu.h
index db79d202..298c6a1d 100644
--- a/cinelerra-5.1/guicast/bcpopupmenu.h
+++ b/cinelerra-5.1/guicast/bcpopupmenu.h
@@ -35,27 +35,22 @@
 class BC_PopupMenu : public BC_SubWindow
 {
 public:
-	BC_PopupMenu(int x,
-		int y,
-		int w,
-		const char *text,
-		int use_title = 1,
+	BC_PopupMenu(int x, int y, int w, const char *text, int use_title = 1,
 // Data for alternative title images
 		VFrame **data = 0,
 // Alternative text margin
 		int margin = -1);
-	BC_PopupMenu(int x,
-		int y,
-		const char *text,
-		int use_title = 1,
+	BC_PopupMenu(int x, int y, const char *text, int use_title = 1,
 // Data for alternative title images
 		VFrame **data = 0);
 	virtual ~BC_PopupMenu();
 
 // Adds popupmenu_margin to width
-	static int calculate_w(int w_argument);
+	static int calculate_w(int margin, int text_width, int use_title);
+	static int calculate_w(int text_width);
 	static int calculate_h(VFrame **data = 0);
 	virtual int handle_event() { return 0; };
+	virtual int draw_face(int dx, int color);
 	char* get_text();
 	int initialize();
 	int add_item(BC_MenuItem *item);
@@ -63,12 +58,13 @@ public:
 	int remove_item(BC_MenuItem *item);
 	int total_items();
 	BC_MenuItem* get_item(int i);
+	int get_margin();
 // Set title of menu
-	void set_text(const char *text, int color=-1);
+	void set_text(const char *text);
 // Set icon of menu.  Disables text.
 	void set_icon(BC_Pixmap *pixmap);
 // Draw title of menu
-	int draw_title(int flush, int color=-1);
+	int draw_title(int flush);
 	int reposition_window(int x, int y);
 	int deactivate();
 	int activate_menu();
@@ -76,8 +72,8 @@ public:
 	int deactivate_menu();
 	int focus_out_event();
 	int repeat_event(int64_t duration);
-	int button_press_event();
-	int button_release_event();
+	virtual int button_press_event();
+	virtual int button_release_event();
 	int cursor_leave_event();
 	int cursor_enter_event();
 	int cursor_motion_event();