Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtgui/cropwindow.h
+++ b/rtgui/cropwindow.h
@@ -96,7 +96,7 @@ class CropWindow : public LWButtonListener, public CropHandlerListener {
    public:
        CropHandler cropHandler;
        CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_, bool isLowUpdatePriority_);
-        ~CropWindow ();
+        virtual ~CropWindow ();

        void setDecorated       (bool decorated)    { this->decorated = decorated; }
        void setFitZoomEnabled  (bool fze)          { fitZoomEnabled = fze; }