← Back to branch summary

~vcs-imports-ii/gnubg/trunk

« back to all changes in this revision

Viewing changes to gtkpanels.c

  • Committer: plm
  • Date: 2017-05-29 15:13:32 UTC
  • Revision ID: plm-20170529151332-8zj2qrr20by0mwlp
Fix some gtk3-related warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtkpanels.c
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
20
 *
21
 
 * $Id: gtkpanels.c,v 1.82 2016/08/16 18:53:45 plm Exp $
 
21
 * $Id: gtkpanels.c,v 1.83 2017/05/29 15:13:32 plm Exp $
22
22
 */
23
23
 
24
24
#include "config.h"
617
617
static GtkWidget *
618
618
CreateCommandWindow(void)
619
619
{
620
 
    GtkWidget *pwhbox;
621
 
    GtkWidget *pwvbox = gtk_vbox_new(FALSE, 0);
 
620
    GtkWidget *pwhbox, *pwvbox;
622
621
    GtkWidget *pwShowHelp;
623
622
 
 
623
#if GTK_CHECK_VERSION(3,0,0)
 
624
    pwvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
625
#else
 
626
    pwvbox = gtk_vbox_new(FALSE, 0);
 
627
#endif
624
628
    CreatePanel(WINDOW_COMMAND, pwvbox, _("GNU Backgammon - Command"), "command");
625
629
 
626
630
    cedPanel.cmdString = NULL;
636
640
    g_signal_connect(G_OBJECT(cedPanel.pwEntry), "key-press-event", G_CALLBACK(CommandKeyPress), &cedPanel);
637
641
    g_signal_connect(G_OBJECT(cedPanel.pwEntry), "activate", G_CALLBACK(CommandOK), &cedPanel);
638
642
 
 
643
#if GTK_CHECK_VERSION(3,0,0)
 
644
    pwhbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
645
#else
639
646
    pwhbox = gtk_hbox_new(FALSE, 0);
 
647
#endif
640
648
    gtk_box_pack_start(GTK_BOX(pwvbox), pwhbox, FALSE, FALSE, 0);
641
649
 
642
650
    gtk_box_pack_start(GTK_BOX(pwhbox), cedPanel.cmdEntryCombo, TRUE, TRUE, 10);
671
679
        gtk_window_add_accel_group(GTK_WINDOW(woPanel[WINDOW_ANALYSIS].pwWin), pagMain);
672
680
 
673
681
        gtk_paned_pack1(GTK_PANED(pwPaned), pwAnalysis = gtk_label_new(NULL), TRUE, FALSE);
674
 
        gtk_paned_pack2(GTK_PANED(pwPaned), pHbox = gtk_hbox_new(FALSE, 0), FALSE, TRUE);
 
682
#if GTK_CHECK_VERSION(3,0,0)
 
683
        pHbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
684
#else
 
685
        pHbox = gtk_hbox_new(FALSE, 0);
 
686
#endif
 
687
        gtk_paned_pack2(GTK_PANED(pwPaned), pHbox, FALSE, TRUE);
675
688
    } else {
 
689
#if GTK_CHECK_VERSION(3,0,0)
 
690
        pHbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
691
#else
676
692
        pHbox = gtk_hbox_new(FALSE, 0);
 
693
#endif
677
694
        gtk_box_pack_start(GTK_BOX(pHbox), pwAnalysis = gtk_label_new(NULL), TRUE, TRUE, 0);
 
695
#if GTK_CHECK_VERSION(3,0,0)
 
696
        pHbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
697
#else
678
698
        pHbox = gtk_hbox_new(FALSE, 0);
 
699
#endif
679
700
    }
680
701
 
681
702
    pwCommentary = gtk_text_view_new();
785
806
static void
786
807
CreateGameWindow(void)
787
808
{
 
809
    GtkWidget *psw = gtk_scrolled_window_new(NULL, NULL);
 
810
    GtkWidget *pvbox, *phbox;
788
811
 
789
 
    GtkWidget *psw = gtk_scrolled_window_new(NULL, NULL),
790
 
        *pvbox = gtk_vbox_new(FALSE, 0), *phbox = gtk_hbox_new(FALSE, 0);
 
812
#if GTK_CHECK_VERSION(3,0,0)
 
813
    g_object_set(G_OBJECT(psw), "expand", TRUE, NULL);
 
814
    pvbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
815
    phbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
816
#else
 
817
    pvbox = gtk_vbox_new(FALSE, 0);
 
818
    phbox = gtk_hbox_new(FALSE, 0);
 
819
#endif
791
820
 
792
821
    if (!woPanel[WINDOW_GAME].docked) {
793
822
        woPanel[WINDOW_GAME].pwWin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
824
853
CreateHeadWindow(gnubgwindow panel, const char *sz, GtkWidget * pwWidge)
825
854
{
826
855
    GtkWidget *pwLab = gtk_label_new(sz);
827
 
    GtkWidget *pwVbox = gtk_vbox_new(FALSE, 0);
828
 
    GtkWidget *pwHbox = gtk_hbox_new(FALSE, 0);
 
856
    GtkWidget *pwVbox, *pwHbox;
829
857
    GtkWidget *pwX = gtk_button_new();
 
858
 
 
859
#if GTK_CHECK_VERSION(3,0,0)
 
860
    pwVbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
861
    pwHbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
862
#else
 
863
    pwVbox = gtk_vbox_new(FALSE, 0);
 
864
    pwHbox = gtk_hbox_new(FALSE, 0);
 
865
#endif
 
866
 
830
867
    gtk_button_set_image(GTK_BUTTON(pwX), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
831
868
    g_signal_connect(G_OBJECT(pwX), "clicked", G_CALLBACK(woPanel[panel].hideFun), NULL);
832
869