Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-02 06:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add appropriate icon flags to all uses of MessageBox; remove a couple

Browse source 
of unnecessary Cancel buttons.
This commit is contained in:
ehouse 2008-12-07 16:24:26 +00:00
parent c38297711e
commit 19d8f307b1
8 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/wince/cemain.c
View file

@ -1115,7 +1115,8 @@ ceLoadSavedGame( CEAppGlobals* globals )
snprintf( buf, VSIZE(buf), "Unable to open dictionary: %s", snprintf( buf, VSIZE(buf), "Unable to open dictionary: %s",
dictName ); dictName );
buf[VSIZE(buf)-1] = '\0'; buf[VSIZE(buf)-1] = '\0';
ceMessageBoxChar( globals, NULL, buf, L"Oops!", MB_OK ); ceMessageBoxChar( globals, NULL, buf, L"Oops!",
MB_OK | MB_ICONHAND );
} }
XP_FREE( globals->mpool, dictName ); XP_FREE( globals->mpool, dictName );
#endif #endif
@ -1355,7 +1356,8 @@ InitInstance(HINSTANCE hInstance, int nCmdShow
wchar_t buf[512]; wchar_t buf[512];
(void)LoadString( globals->hInst, (UINT)IDS_DICTLOC, buf, VSIZE(buf) ); (void)LoadString( globals->hInst, (UINT)IDS_DICTLOC, buf, VSIZE(buf) );
assertOnTop( globals->hWnd ); assertOnTop( globals->hWnd );
MessageBox( globals->hWnd, buf, L"Dictionary Not Found", MB_OK ); MessageBox( globals->hWnd, buf, L"Dictionary Not Found",
MB_OK | MB_ICONHAND );
result = FALSE; result = FALSE;
goto exit; goto exit;
} }
@ -1490,7 +1492,7 @@ ceCountsAndValues( CEAppGlobals* globals )
server_formatDictCounts( globals->game.server, stream, 3 ); server_formatDictCounts( globals->game.server, stream, 3 );
(void)ceMsgFromStream( globals, stream, L"Tile Counts and Values", (void)ceMsgFromStream( globals, stream, L"Tile Counts and Values",
MB_OK, XP_TRUE ); MB_OK | MB_ICONINFORMATION, XP_TRUE );
} }
} /* ceCountsAndValues */ } /* ceCountsAndValues */
@ -1502,7 +1504,7 @@ ceTilesLeft( CEAppGlobals* globals )
board_formatRemainingTiles( globals->game.board, stream ); board_formatRemainingTiles( globals->game.board, stream );
(void)ceMsgFromStream( globals, stream, L"Remaining tiles", (void)ceMsgFromStream( globals, stream, L"Remaining tiles",
MB_OK, XP_TRUE ); MB_OK | MB_ICONINFORMATION, XP_TRUE );
} }
} /* ceTilesLeft */ } /* ceTilesLeft */
@ -1517,7 +1519,7 @@ ceDoHistory( CEAppGlobals* globals )
model_writeGameHistory( globals->game.model, stream, model_writeGameHistory( globals->game.model, stream,
globals->game.server, gameOver ); globals->game.server, gameOver );
(void)ceMsgFromStream( globals, stream, L"Game history", (void)ceMsgFromStream( globals, stream, L"Game history",
MB_OK, XP_TRUE ); MB_OK | MB_ICONINFORMATION, XP_TRUE );
} /* ceDoHistory */ } /* ceDoHistory */
static void static void
@ -1573,7 +1575,7 @@ ceDisplayFinalScores( CEAppGlobals* globals )
stream_putU8( stream, '\0' ); stream_putU8( stream, '\0' );
(void)ceMsgFromStream( globals, stream, L"Final scores", (void)ceMsgFromStream( globals, stream, L"Final scores",
MB_OK, XP_TRUE ); MB_OK | MB_ICONINFORMATION, XP_TRUE );
} /* ceDisplayFinalScores */ } /* ceDisplayFinalScores */
static XP_Bool static XP_Bool
@ -2203,7 +2205,8 @@ doAbout( CEAppGlobals* globals )
wchar_t buf[1024]; wchar_t buf[1024];
(void)LoadString( globals->hInst, (UINT)IDS_ABOUT, buf, VSIZE(buf) ); (void)LoadString( globals->hInst, (UINT)IDS_ABOUT, buf, VSIZE(buf) );
assertOnTop( globals->hWnd ); assertOnTop( globals->hWnd );
MessageBox( globals->hWnd, buf, L"About", MB_OK ); MessageBox( globals->hWnd, buf, L"About " LCROSSWORDS_DIR,
MB_OK | MB_ICONINFORMATION );
} }
LRESULT CALLBACK LRESULT CALLBACK
@ -2633,7 +2636,7 @@ ceMsgFromStream( CEAppGlobals* globals, XWStreamCtxt* stream,
state.title = title; state.title = title;
state.stream = stream; state.stream = stream;
state.isQuery = buttons != MB_OK; state.isQuery = (buttons & ~MB_ICONMASK) != MB_OK;
state.dlgHdr.globals = globals; state.dlgHdr.globals = globals;
assertOnTop( globals->hWnd ); assertOnTop( globals->hWnd );
@ -2684,15 +2687,16 @@ queryBoxChar( HWND hWnd, const XP_UCHAR* msg )
widebuf, VSIZE(widebuf) ); widebuf, VSIZE(widebuf) );
widebuf[len] = 0; widebuf[len] = 0;
answer = MessageBox( hWnd, widebuf, L"Question", MB_YESNO ); answer = MessageBox( hWnd, widebuf, L"Question",
MB_YESNO | MB_ICONQUESTION );
return answer == IDOK || answer == IDYES; return answer == IDOK || answer == IDYES;
} /* queryBoxChar */ } /* queryBoxChar */
static XP_Bool static XP_Bool
ceQueryFromStream( CEAppGlobals* globals, XWStreamCtxt* stream ) ceQueryFromStream( CEAppGlobals* globals, XWStreamCtxt* stream )
{ {
return ceMsgFromStream( globals, stream, L"Question", XP_TRUE, return ceMsgFromStream( globals, stream, L"Question",
XP_FALSE ); MB_OKCANCEL | MB_ICONQUESTION, XP_FALSE );
} /* ceQueryFromStream */ } /* ceQueryFromStream */
static void static void
@ -2743,7 +2747,7 @@ wince_warnf(const XP_UCHAR* format, ...)
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, buf, slen, MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, buf, slen,
widebuf, slen ); widebuf, slen );
MessageBox( NULL, widebuf, L"WARNF", MB_OK ); MessageBox( NULL, widebuf, L"WARNF", MB_OK | MB_ICONHAND );
} /* wince_warnf */ } /* wince_warnf */
void void
@ -2968,7 +2972,7 @@ ce_util_userError( XW_UtilCtxt* uc, UtilErrID id )
break; break;
} }
ceMessageBoxChar( globals, NULL, message, L"Oops!", MB_OK ); ceMessageBoxChar( globals, NULL, message, L"Oops!", MB_OK | MB_ICONHAND );
} /* ce_util_userError */ } /* ce_util_userError */
static XP_Bool static XP_Bool
@ -2987,11 +2991,11 @@ ce_util_userQuery( XW_UtilCtxt* uc, UtilQueryID id, XWStreamCtxt* stream )
return queryBoxChar( globals->hWnd, query ); return queryBoxChar( globals->hWnd, query );
case QUERY_ROBOT_MOVE: case QUERY_ROBOT_MOVE:
return ceMsgFromStream( globals, stream, L"FYI", XP_FALSE, return ceMsgFromStream( globals, stream, L"FYI",
XP_FALSE ); MB_OK | MB_ICONINFORMATION, XP_FALSE );
case QUERY_ROBOT_TRADE: case QUERY_ROBOT_TRADE:
messageBoxStream( globals, stream, L"FYI", MB_OK ); messageBoxStream( globals, stream, L"FYI", MB_OK | MB_ICONINFORMATION);
break; break;
default: default:
@ -3339,7 +3343,8 @@ ce_util_warnIllegalWord( XW_UtilCtxt* uc, BadWordInfo* bwi,
sprintf( msgBuf, "Word[s] %s not found in dictionary.", wordsBuf ); sprintf( msgBuf, "Word[s] %s not found in dictionary.", wordsBuf );
if ( turnLost ) { if ( turnLost ) {
ceMessageBoxChar( globals, NULL, msgBuf, L"Illegal word", MB_OK ); ceMessageBoxChar( globals, NULL, msgBuf, L"Illegal word",
MB_OK | MB_ICONHAND );
isOk = XP_TRUE; isOk = XP_TRUE;
} else { } else {
strcat( msgBuf, " Use it anyway?" ); strcat( msgBuf, " Use it anyway?" );

5
xwords4/wince/ceprefs.c
View file

@ -333,8 +333,9 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case IDC_CHECKHINTSLIMITS: case IDC_CHECKHINTSLIMITS:
if ( IS_SMARTPHONE(globals) ) { if ( IS_SMARTPHONE(globals) ) {
ceMessageBoxChar( globals, hDlg, "This feature requires a " ceMessageBoxChar( globals, hDlg, "This feature "
"touch screen.", L"Sorry", MB_OK ); "requires a touch screen.",
L"Sorry", MB_OK | MB_ICONHAND );
ceSetChecked( hDlg, IDC_CHECKHINTSLIMITS, XP_FALSE ); ceSetChecked( hDlg, IDC_CHECKHINTSLIMITS, XP_FALSE );
} }
break; break;

3
xwords4/wince/cestrbx.c
View file

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

5
xwords4/wince/cesvdgms.c
View file

@ -122,7 +122,8 @@ SaveNameDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
wchar_t widebuf[128]; wchar_t widebuf[128];
snwprintf( widebuf, VSIZE(widebuf), snwprintf( widebuf, VSIZE(widebuf),
L"File \"%s\" already exists.", buf ); L"File \"%s\" already exists.", buf );
result = MessageBox( hDlg, widebuf, L"Oops!", MB_OK ); result = MessageBox( hDlg, widebuf, L"Oops!",
MB_OK | MB_ICONHAND );
(void)SetDlgItemText( hDlg, IDC_SVGN_EDIT, state->buf ); (void)SetDlgItemText( hDlg, IDC_SVGN_EDIT, state->buf );
break; break;
} }
@ -401,7 +402,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_DONEONLY ); ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_OKONLY );
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_DONE_MENUBAR:IDM_OKCANCEL_MENUBAR; mbi.nToolBarId = doneOnly? IDM_OK_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_DONEONLY) != 0); (doWhat & DLG_STATE_OKONLY) != 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_DONEONLY)) ? WPARAM cmd = (0 != (dlgHdr->doWhat & DLG_STATE_OKONLY)) ?
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

@ -62,7 +62,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_DONEONLY = 2 , DLG_STATE_OKONLY = 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_DONE_MENUBAR 122 #define IDM_OK_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,7 +233,6 @@
#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_DONE_MENUBAR RCDATA IDM_OK_MENUBAR RCDATA
BEGIN BEGIN
0, 1, 0, 1,
I_IMAGENONE, IDOK, TBSTATE_ENABLED, I_IMAGENONE, IDOK, TBSTATE_ENABLED,
TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_DONE, 0, TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_OK, 0,
NOMENU NOMENU
END END
#endif #endif
@ -913,7 +913,6 @@ 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 "\