Merge from default branch

rtgui/filepanel.h

@@ -56,8 +56,6 @@ class FilePanel : public Gtk::HPaned,
     public:
         FilePanel ();
 
-        void on_realize ();
-
         void setParent (RTWindow* p) { parent = p; }
         void init (); // dont call it directly, the constructor calls it as idle source
         void open (const Glib::ustring& d); // open a file or a directory
@@ -72,6 +70,8 @@ class FilePanel : public Gtk::HPaned,
 
         void optionsChanged         ();
         bool imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::InitialImage*> * );
+
+        bool handleShortcutKey (GdkEventKey* event);
 };
 
 #endif