Apply Guichan's changes from 957109f8411fba542c42860413d1bc8938173553…

… (Mar 5th 2008) Typos have been fixed. http://code.google.com/p/guichan/issues/detail?id=35
kallisti5 · Aug 19, 2024 · eac0ced · eac0ced
1 parent 058724f
commit eac0ced
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from 957109f8411fba542c42860413d1bc8938173553
+* Continue rebasing from 33d1e46684936a304ae82587a0c35c68d6b0b93c
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/src/gui.cpp b/src/gui.cpp
@@ -360,7 +360,7 @@ namespace gcn
                                          MouseEvent::EXITED,
                                          mouseInput.getButton(),
                                          mouseInput.getX(),
-                                         mouseInput.getX(),
+                                         mouseInput.getY(),
                                          true,
                                          true);
                 }
@@ -406,9 +406,9 @@ namespace gcn
                                              MouseEvent::EXITED,
                                              mouseInput.getButton(),
                                              mouseInput.getX(),
-                                             mouseInput.getX(),
+                                             mouseInput.getY(),
                                              true,
-                                             true);                                       
+                                             true);
                         mClickCount = 1;
                         mLastMousePressTimeStamp = 0;
                         mWidgetWithMouseQueue.erase(iter);
@@ -599,7 +599,7 @@ namespace gcn
             {
                 mFocusHandler->setLastWidgetPressed(NULL);
             }
-            
+
             sourceWidget = mFocusHandler->getDraggedWidget();
         }
 
@@ -612,15 +612,15 @@ namespace gcn
                              mouseInput.getX(),
                              mouseInput.getY());
 
-        if (mouseInput.getButton() == mLastMousePressButton            
+        if (mouseInput.getButton() == mLastMousePressButton
             && mFocusHandler->getLastWidgetPressed() == sourceWidget)
         {
             distributeMouseEvent(sourceWidget,
                                  MouseEvent::CLICKED,
                                  mouseInput.getButton(),
                                  mouseInput.getX(),
                                  mouseInput.getY());
-            
+
             mFocusHandler->setLastWidgetPressed(NULL);
         }
         else