mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-30 08:34:16 +01:00
pass globals to palm_dictionary_make; handle five-way up/down in ask
dialog scrolling
This commit is contained in:
parent
b0fd07a571
commit
045383f7dd
1 changed files with 8 additions and 4 deletions
|
@ -576,8 +576,8 @@ loadCurrentGame( PalmAppGlobals* globals, XP_U16 gIndex,
|
||||||
if ( hasDict ) {
|
if ( hasDict ) {
|
||||||
XP_UCHAR* name = stringFromStream( MPPARM(globals->mpool)
|
XP_UCHAR* name = stringFromStream( MPPARM(globals->mpool)
|
||||||
recStream );
|
recStream );
|
||||||
dict = palm_dictionary_make( MPPARM(globals->mpool) name,
|
dict = palm_dictionary_make( MPPARM(globals->mpool) globals,
|
||||||
globals->dictList );
|
name, globals->dictList );
|
||||||
success = dict != NULL;
|
success = dict != NULL;
|
||||||
|
|
||||||
if ( !success ) {
|
if ( !success ) {
|
||||||
|
@ -1854,7 +1854,7 @@ initAndStartBoard( PalmAppGlobals* globals, XP_Bool newGame )
|
||||||
|
|
||||||
if ( !dict ) {
|
if ( !dict ) {
|
||||||
XP_ASSERT( !!newDictName );
|
XP_ASSERT( !!newDictName );
|
||||||
dict = palm_dictionary_make( MPPARM(globals->mpool)
|
dict = palm_dictionary_make( MPPARM(globals->mpool) globals,
|
||||||
copyString( MEMPOOL newDictName ),
|
copyString( MEMPOOL newDictName ),
|
||||||
globals->dictList );
|
globals->dictList );
|
||||||
XP_ASSERT( !!dict );
|
XP_ASSERT( !!dict );
|
||||||
|
@ -2729,9 +2729,11 @@ handleScrollInAsk( EventPtr event )
|
||||||
case keyDownEvent:
|
case keyDownEvent:
|
||||||
switch ( event->data.keyDown.chr ) {
|
switch ( event->data.keyDown.chr ) {
|
||||||
case pageUpChr:
|
case pageUpChr:
|
||||||
|
case vchrRockerUp:
|
||||||
direction = winUp;
|
direction = winUp;
|
||||||
break;
|
break;
|
||||||
case pageDownChr:
|
case pageDownChr:
|
||||||
|
case vchrRockerDown:
|
||||||
direction = winDown;
|
direction = winDown;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -3363,7 +3365,9 @@ palm_util_getCurSeconds( XW_UtilCtxt* uc )
|
||||||
static DictionaryCtxt*
|
static DictionaryCtxt*
|
||||||
palm_util_makeEmptyDict( XW_UtilCtxt* uc )
|
palm_util_makeEmptyDict( XW_UtilCtxt* uc )
|
||||||
{
|
{
|
||||||
DictionaryCtxt* result = palm_dictionary_make( MPPARM(uc->mpool) NULL, NULL );
|
PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure;
|
||||||
|
DictionaryCtxt* result = palm_dictionary_make( MPPARM(uc->mpool)
|
||||||
|
globals, NULL, NULL );
|
||||||
XP_ASSERT( !!result );
|
XP_ASSERT( !!result );
|
||||||
return result;
|
return result;
|
||||||
} /* palm_util_makeEmptyDict */
|
} /* palm_util_makeEmptyDict */
|
||||||
|
|
Loading…
Add table
Reference in a new issue