asset drag/drop to viewers, bluebanana bug, listbox fontlist highlight

[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindowgui.h

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 79b41878cb0bfbc6bc2ffdf64d7f1161791dddf5..04fac7046df98e6f5171bc8e05e337da60e217a4 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -69,7 +69,8 @@ public:
        AssetPicon(MWindow *mwindow, AWindowGUI *gui, EDL *edl);
        AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin);
        AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *plugin);
-       AssetPicon(MWindow *mwindow, AWindowGUI *gui, const char *folder);
+       AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder);
+       AssetPicon(MWindow *mwindow, AWindowGUI *gui, const char *folder_name, int folder_num);
        virtual ~AssetPicon();
 
        void create_objects();
@@ -79,6 +80,7 @@ public:
        AWindowGUI *gui;
        BC_Pixmap *icon;
        VFrame *icon_vframe;
+       int foldernum;
 // ID of thing pointed to
        int id;
 
@@ -158,7 +160,7 @@ public:
        void update_effects();
        void sort_assets();
        void reposition_objects();
-       int current_folder_number();
+       static int folder_number(const char *name);
 // Call back for MWindow entry point
        int drag_motion();
        int drag_stop();
@@ -171,10 +173,8 @@ public:
                int is_transition);
        void create_label_folder();
        void copy_picons(ArrayList<BC_ListBoxItem*> *dst,
-               ArrayList<BC_ListBoxItem*> *src,
-               char *folder);
-       void sort_picons(ArrayList<BC_ListBoxItem*> *src,
-               char *folder);
+               ArrayList<BC_ListBoxItem*> *src, int folder);
+       void sort_picons(ArrayList<BC_ListBoxItem*> *src);
 // Return the selected asset in asset_list
        Indexable* selected_asset();
        PluginServer* selected_plugin();
@@ -184,6 +184,7 @@ public:
        int load_defaults(BC_Hash *defaults);
        void start_vicon_drawing();
        void stop_vicon_drawing();
+       void update_picon(Indexable *indexable);
 
        MWindow *mwindow;
        AWindow *awindow;
@@ -246,6 +247,7 @@ public:
        int create_custom_xatoms();
 // Function to overload to recieve customly defined atoms
        virtual int recieve_custom_xatoms(xatom_event *event);
+       static const char *folder_names[];
 
 private:
        void update_folder_list();
@@ -269,7 +271,6 @@ public:
        int drag_motion_event();
        int drag_stop_event();
        int button_press_event();
-       int button_release_event();
        int column_resize_event();
        int focus_in_event();
        int focus_out_event();
@@ -300,7 +301,6 @@ public:
 
        int selection_changed();
        int button_press_event();
-       int button_release_event();
 
        MWindow *mwindow;
        AWindowGUI *gui;