diff --git a/xwords4/wince/cestrbx.c b/xwords4/wince/cestrbx.c index d53853a70..9aa0986f4 100755 --- a/xwords4/wince/cestrbx.c +++ b/xwords4/wince/cestrbx.c @@ -78,7 +78,7 @@ StrBox(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) } ceDlgSetup( &state->dlgHdr, hDlg, - state->isQuery? DLG_STATE_NONE : DLG_STATE_OKONLY ); + state->isQuery? DLG_STATE_NONE : DLG_STATE_DONEONLY ); handled = TRUE; } else { diff --git a/xwords4/wince/cesvdgms.c b/xwords4/wince/cesvdgms.c index 4c4b0e416..0d6e655cd 100644 --- a/xwords4/wince/cesvdgms.c +++ b/xwords4/wince/cesvdgms.c @@ -404,7 +404,7 @@ SavedGamesDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) state->inited = XP_FALSE; state->gameListId = LB_IF_PPC(state->dlgHdr.globals,IDC_SVGM_GAMELIST); - ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_OKONLY ); + ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_DONEONLY ); ceDlgComboShowHide( &state->dlgHdr, IDC_SVGM_GAMELIST ); result = TRUE; diff --git a/xwords4/wince/ceutil.c b/xwords4/wince/ceutil.c index d6d0c160c..301a71e3d 100755 --- a/xwords4/wince/ceutil.c +++ b/xwords4/wince/ceutil.c @@ -307,7 +307,7 @@ mkFullscreenWithSoftkeys( CEAppGlobals* globals, HWND hDlg, XP_U16 curHt, XP_MEMSET( &mbi, 0, sizeof(mbi) ); mbi.cbSize = sizeof(mbi); mbi.hwndParent = hDlg; - mbi.nToolBarId = doneOnly? IDM_OK_MENUBAR:IDM_OKCANCEL_MENUBAR; + mbi.nToolBarId = doneOnly? IDM_DONE_MENUBAR:IDM_OKCANCEL_MENUBAR; mbi.hInstRes = globals->hInst; success = SHCreateMenuBar( &mbi ); if ( !success ) { @@ -358,7 +358,7 @@ ceDlgSetup( CeDlgHdr* dlgHdr, HWND hDlg, DlgStateTask doWhat ) #ifdef _WIN32_WCE (void)mkFullscreenWithSoftkeys( globals, hDlg, fullHeight, - (doWhat & DLG_STATE_OKONLY) != 0); + (doWhat & DLG_STATE_DONEONLY) != 0); #elif defined DEBUG /* Force it to be small so we can test scrolling etc. */ if ( globals->dbWidth > 0 && globals->dbHeight > 0) { @@ -435,7 +435,7 @@ ceDoDlgHandle( CeDlgHdr* dlgHdr, UINT message, WPARAM wParam, LPARAM lParam ) if ( editHasFocus() ) { SHSendBackToFocusWindow( message, wParam, lParam ); } else if ( 0 != (BACK_KEY_UP_MAYBE & LOWORD(lParam) ) ) { - WPARAM cmd = (0 != (dlgHdr->doWhat & DLG_STATE_OKONLY)) ? + WPARAM cmd = (0 != (dlgHdr->doWhat & DLG_STATE_DONEONLY)) ? IDOK : IDCANCEL; SendMessage( dlgHdr->hDlg, WM_COMMAND, cmd, 0L ); } diff --git a/xwords4/wince/ceutil.h b/xwords4/wince/ceutil.h index 9886d079b..4899868f8 100755 --- a/xwords4/wince/ceutil.h +++ b/xwords4/wince/ceutil.h @@ -63,7 +63,7 @@ XP_U16 ceGetPath( CEAppGlobals* globals, CePathType typ, /* set vHeight to 0 to turn off scrolling */ typedef enum { DLG_STATE_NONE = 0 , DLG_STATE_TRAPBACK = 1 - , DLG_STATE_OKONLY = 2 + , DLG_STATE_DONEONLY = 2 } DlgStateTask; typedef struct CeDlgHdr { CEAppGlobals* globals; diff --git a/xwords4/wince/resource.h b/xwords4/wince/resource.h index e8f0ff89b..945068d79 100755 --- a/xwords4/wince/resource.h +++ b/xwords4/wince/resource.h @@ -19,7 +19,7 @@ #define IDD_COLOREDITDLG 119 #define IDM_MAIN_MENUBAR 120 #define IDM_OKCANCEL_MENUBAR 121 -#define IDM_OK_MENUBAR 122 +#define IDM_DONE_MENUBAR 122 #define IDB_ORIGIN 124 #ifdef XWFEATURE_SEARCHLIMIT # define IDD_ASKHINTLIMTS 125 @@ -233,6 +233,7 @@ #define IDS_CANCEL 40004 #define IDS_OK 40005 #define IDS_ABOUT 40006 +#define IDS_DONE 40007 #define IDS_DICTLOC 40029 #define IDS_SAVENAME 40030 #define IDS_DUPENAME 40031 diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc index 79baf707a..dba82ee27 100755 --- a/xwords4/wince/xwords4.rc +++ b/xwords4/wince/xwords4.rc @@ -152,11 +152,11 @@ BEGIN NOMENU END -IDM_OK_MENUBAR RCDATA +IDM_DONE_MENUBAR RCDATA BEGIN 0, 1, I_IMAGENONE, IDOK, TBSTATE_ENABLED, - TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_OK, 0, + TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_DONE, 0, NOMENU END #endif @@ -913,6 +913,7 @@ BEGIN IDS_DUMMY "--" IDS_CANCEL "Cancel" IDS_OK "Ok" + IDS_DONE "Done" IDS_ABOUT "Crosswords 4.2b7 (rev " SVN_REV ") "\ "for Windows Mobile. Copyright 1998-2008 by "\ "Eric House. This software is released under the GNU "\