passing parent pointer

1 files changed, 26 insertions, 13 deletions

diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp
index 7053421..7f0ff47 100755
--- a/liveengine/src/testApp.cpp
+++ b/liveengine/src/testApp.cpp
@@ -16,14 +16,18 @@ guiWindow::~guiWindow(){
 	cout << "gui window destroyed" << endl;
 }
 void guiWindow::setup(){}
-void guiWindow::setGui(ofxPanel *panel){
-	gui=panel;
+void guiWindow::setParent(testApp *p){
+	parent=p;
 }
 void guiWindow::draw(){
 
-	gui->draw();
+	parent->gui.draw();
 
 }
+void guiWindow::dragEvent(ofDragInfo dragInfo, ofxFenster* win){
+    printf("gui received file:%s\n",dragInfo.files[0].c_str());
+}
+
 //--------------------------------------------------------------
 void testApp::setup(){

 	int midiPort=0;

@@ -52,7 +56,7 @@ void testApp::setup(){
 	note=0;
 
 	makeColours();
-	
+
 	colShift=0;
 
 	controlColours=false;
@@ -94,17 +98,20 @@ void testApp::setup(){
 
 
 	//preview window stuff
+	prevWin=new previewWindow();
 	win=ofxFensterManager::get()->createFenster(0, 0,  600, 800, OF_WINDOW);
 	ofAddListener(win->events.mouseDragged, this, &testApp::mousePressedEvent);
 	ofAddListener(win->events.mousePressed, this, &testApp::mousePressedEvent);
 	ofAddListener(win->events.keyPressed, this, &testApp::keyPressedEvent);
+	ofAddListener(win->events.fileDragEvent, this, &testApp::refDragEvent);
 	win->setWindowTitle("preview");
-	win->addListener(&prevWin);
-	prevWin.setup();
-	prevWin.setBuffer(&vp1.rb2);
+	win->addListener(prevWin);
+	prevWin->setup();
+	prevWin->setBuffer(&vp1.rb2);
 
 	fullscreenoutput=false;
 
+	guiWin=new guiWindow();
 	gui.setup("","panel.xml",0,0);
 	gui.add(reversemain.setup("reverse main", false));
 	gui.add(controlColours.setup("control colours", false));
@@ -118,13 +125,13 @@ void testApp::setup(){
 
 	//gui window stuff
 	ofxFenster* win2=ofxFensterManager::get()->createFenster(0, 0,  200, 400, OF_WINDOW);
-	//ofAddListener(win2->events.mouseDragged, this, &testApp::mousePressedEvent);
-	//ofAddListener(win2->events.mousePressed, this, &testApp::mousePressedEvent);
+	ofAddListener(win2->events.fileDragEvent, this, &testApp::refDragEvent);
+	//ofAddListener(win2->events.mousePressed, 0, &testApp::mousePressedEvent);
 	//ofAddListener(win2->events.keyPressed, this, &testApp::keyPressedEvent);
 	win2->setWindowTitle("config");
-	win2->addListener(&guiWin);
-	guiWin.setup();
-	guiWin.setGui(&gui);
+	win2->addListener(guiWin);
+	guiWin->setup();
+	guiWin->setParent(this);
 
 

 }
@@ -452,8 +459,14 @@ void testApp::gotMessage(ofMessage msg){
 }
 
 //--------------------------------------------------------------
+void testApp::refDragEvent(ofDragInfo &dragInfo){
+    dragEvent(dragInfo);
+}
+void testApp::dragEvent(ofDragInfo dragInfo, ofxFenster* win){
+    dragEvent(dragInfo);
+}
 void testApp::dragEvent(ofDragInfo dragInfo){
-
+    printf("received file:%s\n",dragInfo.files[0].c_str());
 }
 
 void testApp::mousePressedEvent(ofMouseEventArgs &args) {