replaced all ofNotifyMouseXXX function with ofNotifyEvent

because ofNotifyMouseReleased and all similar functions automatically call mouseReleased not the appPtr, resulting in a double trigger of the event
mailiam · Nov 17, 2011 · 381c6ca · 381c6ca
1 parent 553f16f
commit 381c6ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/example/src/testApp.cpp b/example/src/testApp.cpp
@@ -127,13 +127,13 @@ void testApp::mouseDragged(int x, int y, int button)
 //--------------------------------------------------------------
 void testApp::mousePressed(int x, int y, int button)
 {
-
+	cout << "PRESSED" << endl;
 }
 
 //--------------------------------------------------------------
 void testApp::mouseReleased(int x, int y, int button)
 {
-
+	cout << "RELEASED" << endl;
 }
 
 //--------------------------------------------------------------

diff --git a/src/ofxFenster.cpp b/src/ofxFenster.cpp
@@ -181,8 +181,8 @@ void ofxFenster::mouseMoved(int x, int y) {
 
 	mousePos.set(x, y);
 	updateListenersMousePos();
-	//ofNotifyEvent(ofEvents.mouseMoved, mouseEventArgs);
-	ofNotifyMouseMoved(x,y);
+	ofNotifyEvent(ofEvents.mouseMoved, mouseEventArgs);
+	//ofNotifyMouseMoved(x,y);
 	ofNotifyEvent(events.mouseMoved, mouseEventArgs);
 
 	ofxFensterListenerList::iterator it=listeners.begin();
@@ -204,8 +204,8 @@ void ofxFenster::mouseDragged(int x, int y, int button) {
 	mousePos.set(x, y);
 
 	updateListenersMousePos();
-	//ofNotifyEvent(ofEvents.mouseDragged, mouseEventArgs);
-	ofNotifyMouseDragged(x,y,button);
+	ofNotifyEvent(ofEvents.mouseDragged, mouseEventArgs);
+	//ofNotifyMouseDragged(x,y,button);
 	ofNotifyEvent(events.mouseDragged, mouseEventArgs);
 
 	ofxFensterListenerList::iterator it=listeners.begin();
@@ -220,8 +220,8 @@ void ofxFenster::mousePressed(int x, int y, int button) {
 	mouseEventArgs.x = x;
 	mouseEventArgs.y = y;
 	mouseEventArgs.button = button;
-	//ofNotifyEvent(ofEvents.mousePressed, mouseEventArgs);
-	ofNotifyMousePressed(x,y,button);
+	ofNotifyEvent(ofEvents.mousePressed, mouseEventArgs);
+	//ofNotifyMousePressed(x,y,button);
 	ofNotifyEvent(events.mousePressed, mouseEventArgs);
 
 	ofxFensterListenerList::iterator it=listeners.begin();
@@ -240,8 +240,8 @@ void ofxFenster::mouseReleased(int x, int y, int button) {
 	mouseEventArgs.x = x;
 	mouseEventArgs.y = y;
 	mouseEventArgs.button = button;
-	//ofNotifyEvent(ofEvents.mouseReleased, mouseEventArgs);
-	ofNotifyMouseReleased(x,y,button);
+	ofNotifyEvent(ofEvents.mouseReleased, mouseEventArgs);
+	//ofNotifyMouseReleased(x,y,button);
 	ofNotifyEvent(events.mouseReleased, mouseEventArgs);
 
 	ofxFensterListenerList::iterator it=listeners.begin();