Merged master into gtk3, fixed three conflicts.

rtgui/lensgeom.h

@@ -32,11 +32,12 @@ protected:
     Gtk::CheckButton*   fill;
     bool                lastFill;
     sigc::connection    fillConn;
-    ToolParamBlock*           packBox;
+    ToolParamBlock*     packBox;
 
 public:
 
     LensGeometry ();
+    ~LensGeometry ();
 
     Gtk::Box* getPackBox ()
     {
@@ -53,6 +54,11 @@ public:
     {
         rlistener = l;
     }
+    void disableAutoFillIfActive ();
+
+private:
+    static int doDisableAutoFillIfActive (void* data);
+
 };
 
 #endif