Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back out change: button to dismiss Saved games dialog is "Done" again,

Browse source 
not "Ok".
This commit is contained in:
ehouse 2008-12-12 05:28:53 +00:00
parent e28363f369
commit cb7b8bf84f
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/wince/cestrbx.c
View file

@ -78,7 +78,7 @@ StrBox(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
} }
ceDlgSetup( &state->dlgHdr, hDlg, ceDlgSetup( &state->dlgHdr, hDlg,
state->isQuery? DLG_STATE_NONE : DLG_STATE_OKONLY ); state->isQuery? DLG_STATE_NONE : DLG_STATE_DONEONLY );
handled = TRUE; handled = TRUE;
} else { } else {

2
xwords4/wince/cesvdgms.c
View file

@ -404,7 +404,7 @@ SavedGamesDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
state->inited = XP_FALSE; state->inited = XP_FALSE;
state->gameListId = LB_IF_PPC(state->dlgHdr.globals,IDC_SVGM_GAMELIST); 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 ); ceDlgComboShowHide( &state->dlgHdr, IDC_SVGM_GAMELIST );
result = TRUE; result = TRUE;

6
xwords4/wince/ceutil.c
View file

@ -307,7 +307,7 @@ mkFullscreenWithSoftkeys( CEAppGlobals* globals, HWND hDlg, XP_U16 curHt,
XP_MEMSET( &mbi, 0, sizeof(mbi) ); XP_MEMSET( &mbi, 0, sizeof(mbi) );
mbi.cbSize = sizeof(mbi); mbi.cbSize = sizeof(mbi);
mbi.hwndParent = hDlg; 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; mbi.hInstRes = globals->hInst;
success = SHCreateMenuBar( &mbi ); success = SHCreateMenuBar( &mbi );
if ( !success ) { if ( !success ) {
@ -358,7 +358,7 @@ ceDlgSetup( CeDlgHdr* dlgHdr, HWND hDlg, DlgStateTask doWhat )
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
(void)mkFullscreenWithSoftkeys( globals, hDlg, fullHeight, (void)mkFullscreenWithSoftkeys( globals, hDlg, fullHeight,
(doWhat & DLG_STATE_OKONLY) != 0); (doWhat & DLG_STATE_DONEONLY) != 0);
#elif defined DEBUG #elif defined DEBUG
/* Force it to be small so we can test scrolling etc. */ /* Force it to be small so we can test scrolling etc. */
if ( globals->dbWidth > 0 && globals->dbHeight > 0) { if ( globals->dbWidth > 0 && globals->dbHeight > 0) {
@ -435,7 +435,7 @@ ceDoDlgHandle( CeDlgHdr* dlgHdr, UINT message, WPARAM wParam, LPARAM lParam )
if ( editHasFocus() ) { if ( editHasFocus() ) {
SHSendBackToFocusWindow( message, wParam, lParam ); SHSendBackToFocusWindow( message, wParam, lParam );
} else if ( 0 != (BACK_KEY_UP_MAYBE & LOWORD(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; IDOK : IDCANCEL;
SendMessage( dlgHdr->hDlg, WM_COMMAND, cmd, 0L ); SendMessage( dlgHdr->hDlg, WM_COMMAND, cmd, 0L );
} }

2
xwords4/wince/ceutil.h
View file

@ -63,7 +63,7 @@ XP_U16 ceGetPath( CEAppGlobals* globals, CePathType typ,
/* set vHeight to 0 to turn off scrolling */ /* set vHeight to 0 to turn off scrolling */
typedef enum { DLG_STATE_NONE = 0 typedef enum { DLG_STATE_NONE = 0
, DLG_STATE_TRAPBACK = 1 , DLG_STATE_TRAPBACK = 1
, DLG_STATE_OKONLY = 2 , DLG_STATE_DONEONLY = 2
} DlgStateTask; } DlgStateTask;
typedef struct CeDlgHdr { typedef struct CeDlgHdr {
CEAppGlobals* globals; CEAppGlobals* globals;

3
xwords4/wince/resource.h
View file

@ -19,7 +19,7 @@
#define IDD_COLOREDITDLG 119 #define IDD_COLOREDITDLG 119
#define IDM_MAIN_MENUBAR 120 #define IDM_MAIN_MENUBAR 120
#define IDM_OKCANCEL_MENUBAR 121 #define IDM_OKCANCEL_MENUBAR 121
#define IDM_OK_MENUBAR 122 #define IDM_DONE_MENUBAR 122
#define IDB_ORIGIN 124 #define IDB_ORIGIN 124
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
# define IDD_ASKHINTLIMTS 125 # define IDD_ASKHINTLIMTS 125
@ -233,6 +233,7 @@
#define IDS_CANCEL 40004 #define IDS_CANCEL 40004
#define IDS_OK 40005 #define IDS_OK 40005
#define IDS_ABOUT 40006 #define IDS_ABOUT 40006
#define IDS_DONE 40007
#define IDS_DICTLOC 40029 #define IDS_DICTLOC 40029
#define IDS_SAVENAME 40030 #define IDS_SAVENAME 40030
#define IDS_DUPENAME 40031 #define IDS_DUPENAME 40031

5
xwords4/wince/xwords4.rc
View file

@ -152,11 +152,11 @@ BEGIN
NOMENU NOMENU
END END
IDM_OK_MENUBAR RCDATA IDM_DONE_MENUBAR RCDATA
BEGIN BEGIN
0, 1, 0, 1,
I_IMAGENONE, IDOK, TBSTATE_ENABLED, I_IMAGENONE, IDOK, TBSTATE_ENABLED,
TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_OK, 0, TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_DONE, 0,
NOMENU NOMENU
END END
#endif #endif
@ -913,6 +913,7 @@ BEGIN
IDS_DUMMY "--" IDS_DUMMY "--"
IDS_CANCEL "Cancel" IDS_CANCEL "Cancel"
IDS_OK "Ok" IDS_OK "Ok"
IDS_DONE "Done"
IDS_ABOUT "Crosswords 4.2b7 (rev " SVN_REV ") "\ IDS_ABOUT "Crosswords 4.2b7 (rev " SVN_REV ") "\
"for Windows Mobile. Copyright 1998-2008 by "\ "for Windows Mobile. Copyright 1998-2008 by "\
"Eric House. This software is released under the GNU "\ "Eric House. This software is released under the GNU "\