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/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -53,7 +53,9 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{

        bool keyPressed (GdkEventKey* event);
        bool on_delete_event(GdkEventAny* event);
-        
+        bool on_my_window_state_event(GdkEventWindowState* event);
+        void on_mainNB_switch_page(GtkNotebookPage* page, guint page_num);
+
        void imageDeveloped (Glib::ustring fname); // called by the batchqueue when it finishes an image
        void showPreferences ();
        void on_realize ();