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

fix compile warnings; disable board size combo when not new game.

Browse source
This commit is contained in:
ehouse 2006-09-24 15:34:46 +00:00
parent a7e58126ed
commit bcbb8583c1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
linux/gtknewgame.c
View file

@ -156,7 +156,7 @@ makeButton( char* text, GCallback func, gpointer data )
} /* makeButton */ } /* makeButton */
static GtkWidget* static GtkWidget*
makeNewGameDialog( GtkNewGameState* state ) makeNewGameDialog( GtkNewGameState* state, XP_Bool isNewGame )
{ {
GtkWidget* dialog; GtkWidget* dialog;
GtkWidget* vbox; GtkWidget* vbox;
@ -183,7 +183,7 @@ makeNewGameDialog( GtkNewGameState* state )
gtk_combo_box_append_text( GTK_COMBO_BOX(roleCombo), roles[i] ); gtk_combo_box_append_text( GTK_COMBO_BOX(roleCombo), roles[i] );
} }
g_signal_connect( GTK_OBJECT(roleCombo), "changed", g_signal_connect( GTK_OBJECT(roleCombo), "changed",
role_combo_changed, state ); G_CALLBACK(role_combo_changed), state );
gtk_box_pack_start( GTK_BOX(hbox), roleCombo, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(hbox), roleCombo, FALSE, TRUE, 0 );
gtk_box_pack_start( GTK_BOX(vbox), hbox, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(vbox), hbox, FALSE, TRUE, 0 );
@ -206,7 +206,7 @@ makeNewGameDialog( GtkNewGameState* state )
gtk_widget_show( nPlayersCombo ); gtk_widget_show( nPlayersCombo );
gtk_box_pack_start( GTK_BOX(hbox), nPlayersCombo, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(hbox), nPlayersCombo, FALSE, TRUE, 0 );
g_signal_connect( GTK_OBJECT(nPlayersCombo), "changed", g_signal_connect( GTK_OBJECT(nPlayersCombo), "changed",
nplayers_menu_changed, state ); G_CALLBACK(nplayers_menu_changed), state );
state->juggleButton = makeButton( "Juggle", state->juggleButton = makeButton( "Juggle",
GTK_SIGNAL_FUNC(handle_juggle), GTK_SIGNAL_FUNC(handle_juggle),
@ -271,6 +271,9 @@ makeNewGameDialog( GtkNewGameState* state )
FALSE, TRUE, 0 ); FALSE, TRUE, 0 );
boardSizeCombo = gtk_combo_box_new_text(); boardSizeCombo = gtk_combo_box_new_text();
if ( !isNewGame ) {
gtk_widget_set_sensitive( boardSizeCombo, FALSE );
}
for ( i = 0; i < MAX_SIZE_CHOICES; ++i ) { for ( i = 0; i < MAX_SIZE_CHOICES; ++i ) {
char buf[10]; char buf[10];
@ -283,7 +286,7 @@ makeNewGameDialog( GtkNewGameState* state )
} }
g_signal_connect( GTK_OBJECT(boardSizeCombo), "changed", g_signal_connect( GTK_OBJECT(boardSizeCombo), "changed",
size_combo_changed, state ); G_CALLBACK(size_combo_changed), state );
gtk_widget_show( boardSizeCombo ); gtk_widget_show( boardSizeCombo );
gtk_box_pack_start( GTK_BOX(hbox), boardSizeCombo, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(hbox), boardSizeCombo, FALSE, TRUE, 0 );
@ -488,7 +491,7 @@ newGameDialog( GtkAppGlobals* globals, XP_Bool isNewGame )
state.revert = FALSE; state.revert = FALSE;
state.nCols = globals->cGlobals.params->gi.boardSize; state.nCols = globals->cGlobals.params->gi.boardSize;
dialog = makeNewGameDialog( &state ); dialog = makeNewGameDialog( &state, isNewGame );
newg_load( state.newGameCtxt, newg_load( state.newGameCtxt,
&globals->cGlobals.params->gi ); &globals->cGlobals.params->gi );