From: <kha...@us...> - 2008-03-24 16:48:12
|
Revision: 1268 http://planeshift.svn.sourceforge.net/planeshift/?rev=1268&view=rev Author: khakilord Date: 2008-03-24 09:48:19 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Fixed the enter key not responding on Mac OS. Modified Paths: -------------- trunk/docs/history.txt trunk/src/common/paws/pawsbutton.cpp trunk/src/common/paws/pawsfilenavigation.cpp trunk/src/common/paws/pawslistbox.cpp trunk/src/common/paws/pawswidget.cpp Modified: trunk/docs/history.txt =================================================================== --- trunk/docs/history.txt 2008-03-24 15:15:56 UTC (rev 1267) +++ trunk/docs/history.txt 2008-03-24 16:48:19 UTC (rev 1268) @@ -1,3 +1,6 @@ +*** 2008-03-24 by Andrew Dai +- Fixed the enter key not responding on Mac OS. + *** 2008-03-24 by Anders Reggestad - Fixed so that velSource for npctypes with parent superclass isn't reset when loading the npctype. Modified: trunk/src/common/paws/pawsbutton.cpp =================================================================== --- trunk/src/common/paws/pawsbutton.cpp 2008-03-24 15:15:56 UTC (rev 1267) +++ trunk/src/common/paws/pawsbutton.cpp 2008-03-24 16:48:19 UTC (rev 1268) @@ -347,7 +347,7 @@ bool pawsButton::OnKeyDown( int keyCode, int key, int modifiers ) { - if (enabled && keyCode == CSKEY_ENTER) + if (enabled && key == CSKEY_ENTER) { OnMouseDown(csmbLeft,modifiers,screenFrame.xmin,screenFrame.ymin); return true; Modified: trunk/src/common/paws/pawsfilenavigation.cpp =================================================================== --- trunk/src/common/paws/pawsfilenavigation.cpp 2008-03-24 15:15:56 UTC (rev 1267) +++ trunk/src/common/paws/pawsfilenavigation.cpp 2008-03-24 16:48:19 UTC (rev 1268) @@ -673,7 +673,7 @@ bool pawsFileNavigation::OnKeyDown( int keyCode, int key, int modifiers ) { - if (keyCode==CSKEY_ENTER) + if (key==CSKEY_ENTER) { const char *filetext; pawsEditTextBox *filenametb=(pawsEditTextBox *)FindWidget("fileedit"); Modified: trunk/src/common/paws/pawslistbox.cpp =================================================================== --- trunk/src/common/paws/pawslistbox.cpp 2008-03-24 15:15:56 UTC (rev 1267) +++ trunk/src/common/paws/pawslistbox.cpp 2008-03-24 16:48:19 UTC (rev 1268) @@ -824,7 +824,7 @@ bool pawsListBox::OnKeyDown(int keyCode, int keyChar, int modifiers) { - switch (keyCode) + switch (keyChar) { case CSKEY_UP: MoveSelectBar(true); Modified: trunk/src/common/paws/pawswidget.cpp =================================================================== --- trunk/src/common/paws/pawswidget.cpp 2008-03-24 15:15:56 UTC (rev 1267) +++ trunk/src/common/paws/pawswidget.cpp 2008-03-24 16:48:19 UTC (rev 1268) @@ -1543,7 +1543,7 @@ bool pawsWidget::OnKeyDown( int keyCode, int key, int modifiers ) { - if (keyCode == CSKEY_ENTER) + if (key == CSKEY_ENTER) { if (!onEnter && parent) return parent->OnKeyDown(keyCode,key,modifiers); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |