Revert "Merged master into gtk3, fixed three conflicts."

This reverts commit c857bba95e.

rtgui/lensgeom.h

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