diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c index ad96099fb..8c8f11dd4 100644 --- a/xwords4/linux/gtkboard.c +++ b/xwords4/linux/gtkboard.c @@ -2683,7 +2683,7 @@ initGlobals( GtkGameGlobals* globals, LaunchParams* params, CurGameInfo* gi ) gtk_widget_set_size_request( GTK_WIDGET(drawing_area), width, height ); hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 0 ); - gtk_box_pack_start( GTK_BOX (hbox), drawing_area, TRUE, TRUE, 0); + gtk_box_pack_start( GTK_BOX(hbox), drawing_area, TRUE, TRUE, 0); /* install scrollbar even if not needed -- since zooming can make it needed later */ diff --git a/xwords4/linux/gtkinvit.c b/xwords4/linux/gtkinvit.c index 01a672be1..01809e04f 100644 --- a/xwords4/linux/gtkinvit.c +++ b/xwords4/linux/gtkinvit.c @@ -365,8 +365,7 @@ gtkInviteDlg( GtkGameGlobals* globals, CommsAddrRec* addr, dialog = gtk_dialog_new(); gtk_window_set_modal( GTK_WINDOW( dialog ), TRUE ); - // gtk_container_add( GTK_CONTAINER( gtk_dialog_get_action_area(GTK_DIALOG(dialog))), vbox ); - XP_ASSERT(0); + gtk_dialog_add_action_widget( GTK_DIALOG(dialog), vbox, 0 ); gtk_widget_show_all( dialog ); gtk_main(); diff --git a/xwords4/linux/gtkletterask.c b/xwords4/linux/gtkletterask.c index 7e3c052dd..70546412c 100644 --- a/xwords4/linux/gtkletterask.c +++ b/xwords4/linux/gtkletterask.c @@ -129,7 +129,7 @@ gtkletterask( const PickInfo* pi, XP_Bool forTray, const XP_UCHAR* name, } // gtk_container_add( GTK_CONTAINER( gtk_dialog_get_action_area(GTK_DIALOG(dialog))), vbox); - XP_ASSERT(0); + gtk_dialog_add_action_widget( GTK_DIALOG(dialog), vbox, 0 ); gtk_widget_show_all( dialog ); gtk_main(); diff --git a/xwords4/linux/gtkpasswdask.c b/xwords4/linux/gtkpasswdask.c index a1a7374bb..0292eaa4f 100644 --- a/xwords4/linux/gtkpasswdask.c +++ b/xwords4/linux/gtkpasswdask.c @@ -1,6 +1,7 @@ -/* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */ +/* -*- compile-command: "make MEMDEBUG=TRUE -j3"; -*- */ /* - * Copyright 2000 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 2000 - 2016 by Eric House (xwords@eehouse.org). All rights + * reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -75,8 +76,7 @@ gtkpasswdask( const char* name, char* outbuf, XP_U16* buflen ) gtk_box_pack_start( GTK_BOX(vbox), hbox, FALSE, TRUE, 0 ); - // gtk_container_add( GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), vbox); - XP_ASSERT(0); + gtk_dialog_add_action_widget( GTK_DIALOG(dialog), vbox, 0 ); gtk_widget_show_all( dialog );