Merge branch 'dev' into favorites-gui

2023-01-02 15:37:07 -08:00
parent 6a0067d738 f449a726e8
commit 143e5c6783
193 changed files with 64046 additions and 10050 deletions
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -501,8 +501,11 @@ private:
    RTImage *image;
    Gtk::Label *label;

+    void construct(Glib::ustring label, RTImage* image);
+
 public:
    MyImageMenuItem (Glib::ustring label, Glib::ustring imageFileName);
+    MyImageMenuItem (Glib::ustring label, RTImage* image);
    const RTImage *getImage () const;
    const Gtk::Label* getLabel () const;
 };