Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove params from ceDlgSetup and ceDoDlgFocusScroll

Browse source
This commit is contained in:
ehouse 2008-03-31 00:23:07 +00:00
parent 7790bf13ff
commit 10c9b15980
6 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/wince/ceblank.c
View file

@ -103,7 +103,7 @@ BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
&& bState->pi->thisPick > 0 );
#endif
ceDlgSetup( bState->globals, hDlg, XP_TRUE );
ceDlgSetup( bState->globals, hDlg );
loadLettersList( hDlg, bState );
} else {

4
xwords4/wince/cecondlg.c
View file

@ -178,7 +178,7 @@ ConnsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
ceControlsFromAddrRec( hDlg, cState );
ceDlgSetup( globals, hDlg, XP_FALSE );
ceDlgSetup( globals, hDlg );
result = TRUE;
} else {
@ -211,7 +211,7 @@ ConnsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
}
} else if ( message == WM_VSCROLL ) {
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( globals, hDlg, wParam );
ceDoDlgScroll( hDlg, wParam );
}
}
}

31
xwords4/wince/ceginfo.c
View file

@ -488,6 +488,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
CEAppGlobals* globals;
XP_U16 id;
GameInfoState* giState;
LRESULT result = FALSE;
/* XP_LOGF( "%s: %s(%d)", __func__, messageToStr( message ), message ); */
@ -497,7 +498,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
giState->hDlg = hDlg;
globals = giState->globals;
ceDlgSetup( globals, hDlg, XP_TRUE );
ceDlgSetup( globals, hDlg );
giState->newGameCtx = newg_make( MPPARM(globals->mpool)
giState->isNewGame,
@ -516,7 +517,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if ( giState->isNewGame ) {
(void)SetWindowText( hDlg, L"New game" );
}
return TRUE;
result = TRUE;
} else {
giState = (GameInfoState*)GetWindowLong( hDlg, GWL_USERDATA );
@ -527,27 +528,27 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( globals, hDlg, wParam );
ceDoDlgScroll( hDlg, wParam );
result = TRUE;
}
break;
/* WM_NEXTDLGCTL is worthless; prev obj still has focus */
/* case WM_NEXTDLGCTL: */
/* if ( !IS_SMARTPHONE(globals) ) { */
/* ceDoDlgFocusScroll( globals, hDlg, wParam, lParam ); */
/* } */
/* break; */
case WM_NEXTDLGCTL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgFocusScroll( hDlg, wParam, lParam );
}
break;
#ifdef OWNERDRAW_JUGGLE
case WM_DRAWITEM: /* for BS_OWNERDRAW style */
ceDrawIconButton( globals, (DRAWITEMSTRUCT*)lParam );
return TRUE;
result = TRUE;
break;
#endif
case WM_COMMAND:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgFocusScroll( globals, hDlg );
}
result = TRUE;
id = LOWORD(wParam);
switch( id ) {
@ -635,9 +636,10 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
giState->userCancelled = id == IDCANCEL;
cleanupGameInfoState( giState );
newg_destroy( giState->newGameCtx );
return TRUE;
}
break;
default:
result = FALSE;
/* case WM_CLOSE: */
/* EndDialog(hDlg, id); */
/* return TRUE; */
@ -646,5 +648,6 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
}
}
}
return FALSE;
return result;
} /* GameInfo */

2
xwords4/wince/cehntlim.c
View file

@ -63,7 +63,7 @@ HintLimitsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
hState = (HintLimitsState*)lParam;
globals = hState->globals;
ceDlgSetup( globals, hDlg, XP_FALSE );
ceDlgSetup( globals, hDlg );
return TRUE;
} else {

12
xwords4/wince/ceprefs.c
View file

@ -260,7 +260,7 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
loadControlsFromState( hDlg, pState );
adjustForChoice( hDlg, pState );
ceDlgSetup( globals, hDlg, XP_TRUE );
ceDlgSetup( globals, hDlg );
return TRUE;
@ -273,13 +273,17 @@ PrefsDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) {
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( globals, hDlg, wParam );
ceDoDlgScroll( hDlg, wParam );
}
break;
case WM_COMMAND:
case WM_NEXTDLGCTL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgFocusScroll( globals, hDlg );
ceDoDlgFocusScroll( hDlg, wParam, lParam );
}
break;
case WM_COMMAND:
id = LOWORD(wParam);
switch( id ) {

4
xwords4/wince/cestrbx.c
View file

@ -79,7 +79,7 @@ StrBox(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
}
}
ceDlgSetup( globals, hDlg, XP_TRUE );
ceDlgSetup( globals, hDlg );
handled = TRUE;
} else {
@ -91,7 +91,7 @@ StrBox(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_VSCROLL:
if ( !IS_SMARTPHONE(globals) ) {
ceDoDlgScroll( globals, hDlg, wParam );
ceDoDlgScroll( hDlg, wParam );
}
break;