Merge

2010-10-03 19:52:27 +02:00
parent 23a8834755
commit 7c6de47f9d
39 changed files with 698 additions and 347 deletions
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -52,7 +52,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 ();