Intermediate merge of the pipette branch

This commit is contained in:
Hombrenatureh.510
2014-03-15 23:50:36 +01:00
47 changed files with 1666 additions and 1114 deletions

View File

@@ -32,7 +32,7 @@
using namespace rtengine::procparams;
EditorPanel::EditorPanel (FilePanel* filePanel)
: beforePreviewHandler(NULL), beforeIarea(NULL), parent(NULL), ipc(NULL), beforeIpc(NULL), isProcessing(false), catalogPane(NULL) {
: beforePreviewHandler(NULL), beforeIarea(NULL), parent(NULL), ipc(NULL), beforeIpc(NULL), isProcessing(false), catalogPane(NULL), iHistoryShow(NULL), iHistoryHide(NULL), iBeforeLockON(NULL),iBeforeLockOFF(NULL), iRightPanel_1_Show(NULL), iRightPanel_1_Hide(NULL) {
epih = new EditorPanelIdleHelper;
epih->epanel = this;
@@ -375,8 +375,19 @@ EditorPanel::~EditorPanel () {
delete catalogPane;
if (!iTopPanel_1_Show) delete iTopPanel_1_Show;
if (!iTopPanel_1_Hide) delete iTopPanel_1_Hide;
if (!iTopPanel_1_Hide) delete iTopPanel_1_Hide;
if (iHistoryShow)
delete iHistoryShow;
if (iHistoryHide)
delete iHistoryHide;
if(iBeforeLockON)
delete iBeforeLockON;
if(iBeforeLockOFF)
delete iBeforeLockOFF;
if(iRightPanel_1_Show)
delete iRightPanel_1_Show;
if(iRightPanel_1_Hide)
delete iRightPanel_1_Hide;
}
void EditorPanel::leftPaneButtonReleased(GdkEventButton *event) {