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

adjustForConnType only needed when several compiled in.

Browse source
This commit is contained in:
ehouse 2009-10-25 00:53:15 +00:00
parent 27c518dec4
commit 32916d2918
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/wince/cecondlg.c
View file

@ -109,6 +109,7 @@ conTypeToIndex( const CeConnDlgState* state, CommsConnType conType )
} }
#endif #endif
#ifdef NEEDS_CHOOSE_CONNTYPE
static void static void
adjustForConnType( HWND hDlg, CeConnDlgState* state, XP_Bool useFromState ) adjustForConnType( HWND hDlg, CeConnDlgState* state, XP_Bool useFromState )
{ {
@ -136,16 +137,12 @@ adjustForConnType( HWND hDlg, CeConnDlgState* state, XP_Bool useFromState )
XP_U16 ii; XP_U16 ii;
CommsConnType conType; CommsConnType conType;
#ifdef NEEDS_CHOOSE_CONNTYPE
if ( !useFromState ) { if ( !useFromState ) {
XP_S16 sel; XP_S16 sel;
sel = SendDlgItemMessage( hDlg, state->connComboId, sel = SendDlgItemMessage( hDlg, state->connComboId,
GETCURSEL(state->dlgHdr.globals), 0, 0L ); GETCURSEL(state->dlgHdr.globals), 0, 0L );
state->addrRec.conType = indexToConType( state, sel ); state->addrRec.conType = indexToConType( state, sel );
} }
#else
useFromState = useFromState; /* shut up, compiler */
#endif
conType = state->addrRec.conType; conType = state->addrRec.conType;
@ -181,6 +178,7 @@ adjustForConnType( HWND hDlg, CeConnDlgState* state, XP_Bool useFromState )
} }
#endif #endif
} /* adjustForConnType */ } /* adjustForConnType */
#endif
static void static void
ceControlsFromAddrRec( HWND hDlg, const CeConnDlgState* state ) ceControlsFromAddrRec( HWND hDlg, const CeConnDlgState* state )
@ -252,7 +250,6 @@ ceControlsFromAddrRec( HWND hDlg, const CeConnDlgState* state )
ceEnOrDisable( hDlg, ids[nIds], XP_FALSE ); ceEnOrDisable( hDlg, ids[nIds], XP_FALSE );
} }
} }
} /* ceControlsFromAddrRec */ } /* ceControlsFromAddrRec */
static LRESULT CALLBACK static LRESULT CALLBACK
@ -267,8 +264,8 @@ ConnsDlg( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
state = (CeConnDlgState*)lParam; state = (CeConnDlgState*)lParam;
#ifdef NEEDS_CHOOSE_CONNTYPE #ifdef NEEDS_CHOOSE_CONNTYPE
state->connComboId = LB_IF_PPC(state->dlgHdr.globals,IDC_CONNECT_COMBO); state->connComboId = LB_IF_PPC(state->dlgHdr.globals,IDC_CONNECT_COMBO);
#endif
adjustForConnType( hDlg, state, XP_TRUE ); adjustForConnType( hDlg, state, XP_TRUE );
#endif
ceControlsFromAddrRec( hDlg, state ); ceControlsFromAddrRec( hDlg, state );
ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_TRAPBACK ); ceDlgSetup( &state->dlgHdr, hDlg, DLG_STATE_TRAPBACK );