Merge with trunk

2010-10-04 21:51:45 -07:00
parent 7853327bc7 a9fea09400
commit 7159b96087
20 changed files with 133 additions and 49 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -108,6 +108,10 @@ class EditorPanel : public Gtk::VBox,
        virtual ~EditorPanel ();

        void open (Thumbnail* tmb, rtengine::InitialImage* isrc);
+        void setAspect ();
+        void on_realize ();
+        void leftPaneButtonReleased(GdkEventButton *event);
+        void rightPaneButtonReleased(GdkEventButton *event);

        void setParent (RTWindow* p) { parent = p; }

@@ -142,7 +146,7 @@ class EditorPanel : public Gtk::VBox,
        Glib::ustring getFileName ();
        bool handleShortcutKey (GdkEventKey* event);
        
-        void saveOptions ();
+        //void saveOptions ();

        Gtk::Paned *catalogPane;        
 };