return TRUE after handling WM_INITDIALOG

This commit is contained in:
ehouse 2009-01-17 18:41:15 +00:00
parent 7201ef2fa8
commit a672de76b9

View file

@ -1,6 +1,7 @@
/* -*-mode: C; fill-column: 77; c-basic-offset: 4; -*- */ /* -*-mode: C; fill-column: 77; c-basic-offset: 4; -*- */
/* /*
* Copyright 2002,2008 by Eric House (xwords@eehouse.org). All rights reserved. * Copyright 2002-2009 by Eric House (xwords@eehouse.org). All rights
* reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -91,6 +92,7 @@ BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
BlankDialogState* bState; BlankDialogState* bState;
XP_U16 id; XP_U16 id;
LRESULT result = FALSE; /* default */
if ( message == WM_INITDIALOG ) { if ( message == WM_INITDIALOG ) {
SetWindowLongPtr( hDlg, GWL_USERDATA, lParam ); SetWindowLongPtr( hDlg, GWL_USERDATA, lParam );
@ -114,12 +116,14 @@ BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
ceDlgComboShowHide( &bState->dlgHdr, BLANKFACE_LIST ); ceDlgComboShowHide( &bState->dlgHdr, BLANKFACE_LIST );
loadLettersList( bState ); loadLettersList( bState );
result = TRUE;
} else { } else {
bState = (BlankDialogState*)GetWindowLongPtr( hDlg, GWL_USERDATA ); bState = (BlankDialogState*)GetWindowLongPtr( hDlg, GWL_USERDATA );
if ( !!bState ) { if ( !!bState ) {
if ( ceDoDlgHandle( &bState->dlgHdr, message, wParam, lParam) ) { if ( ceDoDlgHandle( &bState->dlgHdr, message, wParam, lParam) ) {
return TRUE; result = TRUE;
goto exit;
} }
switch ( message ) { switch ( message ) {
@ -142,10 +146,11 @@ BlankDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
} }
EndDialog( hDlg, id ); EndDialog( hDlg, id );
return TRUE; result = TRUE;
} }
} }
} }
return FALSE; exit:
return result;
} /* BlankDlg */ } /* BlankDlg */