Merge branch 'master' into 'gtk3'

Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.

rtgui/thumbbrowserentrybase.h

@@ -74,6 +74,7 @@ protected:
     int redrawRequests;
 
     ThumbBrowserBase* parent;
+    ThumbBrowserEntryBase* original;
 
     Glib::RefPtr<BackBuffer> backBuffer;
     bool bbSelected, bbFramed;
@@ -171,22 +172,17 @@ public:
         return shortname.casefold() > other.shortname.casefold();
     }
 
+    ThumbBrowserEntryBase* getOriginal () const;
+    void setOriginal (ThumbBrowserEntryBase* original);
+
     virtual void refreshThumbnailImage () {}
     virtual void refreshQuickThumbnailImage () {}
     virtual void calcThumbnailSize () {}
 
     virtual void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) {}
 
-    virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ()
-    {
-        std::vector<Glib::RefPtr<Gdk::Pixbuf> >  r;
-        return r;
-    }
-    virtual void getIconSize (int& w, int& h)
-    {
-        w = 0;
-        h = 0;
-    }
+    virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ();
+    virtual void getIconSize (int& w, int& h);
 
     virtual bool    motionNotify  (int x, int y);
     virtual bool    pressNotify   (int button, int type, int bstate, int x, int y);
@@ -194,4 +190,14 @@ public:
     virtual Glib::ustring getToolTip (int x, int y);
 };
 
+inline ThumbBrowserEntryBase* ThumbBrowserEntryBase::getOriginal() const
+{
+    return original;
+}
+
+inline void ThumbBrowserEntryBase::setOriginal(ThumbBrowserEntryBase* original)
+{
+    this->original = original;
+}
+
 #endif