fullscreen segv fix, popup for 4opts preview, renderfarm print fix, pan widget upgrad...

[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / bcpopupmenu.h

diff --git a/cinelerra-5.1/guicast/bcpopupmenu.h b/cinelerra-5.1/guicast/bcpopupmenu.h
index db79d20211d82aab797d50bd18c1e15eb052c292..9ebef28a9acb58fd94b191e3acdad9f57695f786 100644 (file)
--- a/cinelerra-5.1/guicast/bcpopupmenu.h
+++ b/cinelerra-5.1/guicast/bcpopupmenu.h
@@ -53,9 +53,11 @@ public:
        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);
        char* get_text();
        int initialize();
        int add_item(BC_MenuItem *item);
@@ -63,12 +65,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();