From dc6d0e08956c6ad42cc943b7496a192c71bdbe02 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 30 Jul 2016 07:19:40 +0200 Subject: [PATCH] Remove PsppireVButtonBox and PsppireHButtonBox Instead, use the orientable property of the ancester GtkButtonBox --- glade/automake.mk | 6 - .../widget-psppire-psppire-hbuttonbox.png | Bin 128 -> 0 bytes .../widget-psppire-psppire-vbuttonbox.png | Bin 124 -> 0 bytes .../widget-psppire-psppire-hbuttonbox.png | Bin 136 -> 0 bytes .../widget-psppire-psppire-vbuttonbox.png | Bin 134 -> 0 bytes src/ui/gui/aggregate.ui | 3 +- src/ui/gui/automake.mk | 6 +- src/ui/gui/autorecode.ui | 3 +- src/ui/gui/barchart.ui | 3 +- src/ui/gui/binomial.ui | 3 +- src/ui/gui/chi-square.ui | 3 +- src/ui/gui/comments.ui | 3 +- src/ui/gui/compute.ui | 6 +- src/ui/gui/correlation.ui | 3 +- src/ui/gui/count.ui | 6 +- src/ui/gui/crosstabs.ui | 12 +- src/ui/gui/data-editor.ui | 6 +- src/ui/gui/descriptives.ui | 3 +- src/ui/gui/entry-dialog.ui | 3 +- src/ui/gui/examine.ui | 9 +- src/ui/gui/factor.ui | 9 +- src/ui/gui/find.ui | 3 +- src/ui/gui/frequencies.ui | 6 +- src/ui/gui/goto-case.ui | 3 +- src/ui/gui/histogram.ui | 3 +- src/ui/gui/indep-samples.ui | 6 +- src/ui/gui/k-means.ui | 3 +- src/ui/gui/k-related.ui | 3 +- src/ui/gui/ks-one-sample.ui | 3 +- src/ui/gui/logistic.ui | 6 +- src/ui/gui/means.ui | 3 +- src/ui/gui/missing-val-dialog.ui | 3 +- src/ui/gui/oneway.ui | 6 +- src/ui/gui/paired-samples.ui | 3 +- src/ui/gui/psppire-buttonbox.c | 125 +------- src/ui/gui/psppire-buttonbox.h | 30 +- src/ui/gui/psppire-hbuttonbox.c | 293 ------------------ src/ui/gui/psppire-hbuttonbox.h | 54 ---- src/ui/gui/psppire-vbuttonbox.c | 286 ----------------- src/ui/gui/psppire-vbuttonbox.h | 54 ---- src/ui/gui/rank.ui | 9 +- src/ui/gui/recode.ui | 6 +- src/ui/gui/regression.ui | 9 +- src/ui/gui/reliability.ui | 3 +- src/ui/gui/roc.ui | 3 +- src/ui/gui/runs.ui | 3 +- src/ui/gui/scatterplot.ui | 3 +- src/ui/gui/select-cases.ui | 9 +- src/ui/gui/sort.ui | 3 +- src/ui/gui/split-file.ui | 3 +- src/ui/gui/t-test.ui | 6 +- src/ui/gui/transpose.ui | 3 +- src/ui/gui/univariate.ui | 9 +- src/ui/gui/val-labs-dialog.ui | 3 +- src/ui/gui/var-type-dialog.ui | 3 +- src/ui/gui/variable-info.ui | 3 +- src/ui/gui/weight.ui | 3 +- src/ui/gui/widgets.c | 6 +- 58 files changed, 167 insertions(+), 900 deletions(-) delete mode 100644 glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png delete mode 100644 glade/icons/16x16/widget-psppire-psppire-vbuttonbox.png delete mode 100644 glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png delete mode 100644 glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png delete mode 100644 src/ui/gui/psppire-hbuttonbox.c delete mode 100644 src/ui/gui/psppire-hbuttonbox.h delete mode 100644 src/ui/gui/psppire-vbuttonbox.c delete mode 100644 src/ui/gui/psppire-vbuttonbox.h diff --git a/glade/automake.mk b/glade/automake.mk index 4bb87f1ab6..fd947f64d8 100644 --- a/glade/automake.mk +++ b/glade/automake.mk @@ -21,8 +21,6 @@ libglade_psppire_la_SOURCES = \ src/ui/gui/psppire-conf.c \ src/ui/gui/psppire-acr.c \ src/ui/gui/psppire-buttonbox.c \ - src/ui/gui/psppire-hbuttonbox.c \ - src/ui/gui/psppire-vbuttonbox.c \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-dictview.c \ @@ -39,16 +37,12 @@ dist_catalog_DATA = \ dist_small_pixmap_DATA = \ glade/icons/16x16/widget-psppire-psppire-acr.png \ - glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png \ - glade/icons/16x16/widget-psppire-psppire-vbuttonbox.png \ glade/icons/16x16/widget-psppire-psppire-dialog.png \ glade/icons/16x16/widget-psppire-psppire-keypad.png \ glade/icons/16x16/widget-psppire-psppire-selector.png dist_large_pixmap_DATA = \ glade/icons/22x22/widget-psppire-psppire-acr.png \ - glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png \ - glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png \ glade/icons/22x22/widget-psppire-psppire-dialog.png \ glade/icons/22x22/widget-psppire-psppire-keypad.png \ glade/icons/22x22/widget-psppire-psppire-selector.png diff --git a/glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png b/glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png deleted file mode 100644 index bedcf6335fbc1f1145ab3d9634465f98cd49749d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`?w&4=Ar`0Kp5MsZV8Fw0kbUFh zY9=G$oCliD&Qr`flzi8H7N5p@x@LA2({=0VXZA3?eBYT_5h_t^RLvt bJ#E7OOv(I!*DMVsppguou6{1-oD!MQOQ=l{>o{P5w!|Ai})lNJbUcrekszoVm}x-szr)3J*Y61}aCg4_&G X=2#`i3g-#|jbre1^>bP0l+XkK@X9HS diff --git a/glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png b/glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png deleted file mode 100644 index 538a2fb991d0086d727cf0ab282f80f89c901547..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4f{+=$5Ar`0KUO33v;K1W@as7?Q zOPIE+y;TTZr|$SD*VS=GIoHeyhZ}CDt9fc~m|A=KjBJ95d(e87ub-1l=HFlSsJ>r( kf$NdIe@_1~FyH)&A*;)O4KttnF`&^5p00i_>zopr0K)4s`v3p{ diff --git a/glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png b/glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png deleted file mode 100644 index f241e680c2828b75df52615ad386a37b3bcf2b90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fzMd|QAr_~TQxq5u9X@K z5$E#tF*}RIm{k>QZ2s6=aq#p1_xF$&X6`+3!FWb1hv`c}K|zU$#|_>vJkGF^^F6-! hWrc|>|LGDQhV}VD;p&>&9YBK_JYD@<);T3K0RTapCy@XE diff --git a/src/ui/gui/aggregate.ui b/src/ui/gui/aggregate.ui index 5733fe1c31..f42f8cba3c 100644 --- a/src/ui/gui/aggregate.ui +++ b/src/ui/gui/aggregate.ui @@ -623,7 +623,8 @@ - + + horizontal True False 5 diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 0f0ea34662..3da8349c02 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -142,8 +142,7 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-selector.c \ src/ui/gui/psppire-buttonbox.c \ - src/ui/gui/psppire-hbuttonbox.c \ - src/ui/gui/psppire-vbuttonbox.c \ + src/ui/gui/psppire-buttonbox.h \ src/ui/gui/psppire-scanf.c \ src/ui/gui/psppire-scanf.h \ src/ui/gui/psppire-acr.c \ @@ -173,7 +172,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire.c \ src/ui/gui/psppire.h \ src/ui/gui/psppire-acr.h \ - src/ui/gui/psppire-buttonbox.h \ src/ui/gui/psppire-checkbox-treeview.c \ src/ui/gui/psppire-checkbox-treeview.h \ src/ui/gui/psppire-conf.c \ @@ -281,7 +279,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-encoding-selector.h \ src/ui/gui/psppire-format.c \ src/ui/gui/psppire-format.h \ - src/ui/gui/psppire-hbuttonbox.h \ src/ui/gui/psppire-keypad.h \ src/ui/gui/psppire-lex-reader.c \ src/ui/gui/psppire-lex-reader.h \ @@ -308,7 +305,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-sheet.c \ src/ui/gui/psppire-var-sheet.h \ - src/ui/gui/psppire-vbuttonbox.h \ src/ui/gui/psppire-window.c \ src/ui/gui/psppire-window.h \ src/ui/gui/psppire-window-base.c \ diff --git a/src/ui/gui/autorecode.ui b/src/ui/gui/autorecode.ui index 509188c708..d03a4d6273 100644 --- a/src/ui/gui/autorecode.ui +++ b/src/ui/gui/autorecode.ui @@ -311,7 +311,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/barchart.ui b/src/ui/gui/barchart.ui index 6be024a33f..c7b8d0d66c 100644 --- a/src/ui/gui/barchart.ui +++ b/src/ui/gui/barchart.ui @@ -359,7 +359,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/binomial.ui b/src/ui/gui/binomial.ui index 344fa066e9..f84d1f0b11 100644 --- a/src/ui/gui/binomial.ui +++ b/src/ui/gui/binomial.ui @@ -275,7 +275,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/chi-square.ui b/src/ui/gui/chi-square.ui index 0f212fc22a..7a2838bd6f 100644 --- a/src/ui/gui/chi-square.ui +++ b/src/ui/gui/chi-square.ui @@ -389,7 +389,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/comments.ui b/src/ui/gui/comments.ui index c89f51bed8..2803ed666f 100644 --- a/src/ui/gui/comments.ui +++ b/src/ui/gui/comments.ui @@ -66,7 +66,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/compute.ui b/src/ui/gui/compute.ui index 658bf9befd..45a39b0975 100644 --- a/src/ui/gui/compute.ui +++ b/src/ui/gui/compute.ui @@ -303,7 +303,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -691,7 +692,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/correlation.ui b/src/ui/gui/correlation.ui index 70c900fa86..22efb6517d 100644 --- a/src/ui/gui/correlation.ui +++ b/src/ui/gui/correlation.ui @@ -279,7 +279,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/count.ui b/src/ui/gui/count.ui index 96dd69b0f4..bba3861afd 100644 --- a/src/ui/gui/count.ui +++ b/src/ui/gui/count.ui @@ -221,7 +221,8 @@ - + + horizontal True False 5 @@ -307,7 +308,8 @@ - + + horizontal True False 5 diff --git a/src/ui/gui/crosstabs.ui b/src/ui/gui/crosstabs.ui index 2d7106616e..2848feec43 100644 --- a/src/ui/gui/crosstabs.ui +++ b/src/ui/gui/crosstabs.ui @@ -59,7 +59,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -309,7 +310,8 @@ - + + vertical True False 5 @@ -411,7 +413,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -487,7 +490,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui index 048ba0bbb1..785a87b22a 100644 --- a/src/ui/gui/data-editor.ui +++ b/src/ui/gui/data-editor.ui @@ -218,7 +218,7 @@ data_weight-cases _Weight Cases... - uimanager1 + uimanager1 Weight cases by variable data-weight-cases @@ -264,14 +264,14 @@ transform_recode-same - uimanager1 + uimanager1 Recode into _Same Variables... transform-in-to-same-variables - uimanager1 + uimanager1 transform_recode-different Recode into _Different Variables... transform-in-to-different-variables diff --git a/src/ui/gui/descriptives.ui b/src/ui/gui/descriptives.ui index a943585a94..637d0a2453 100644 --- a/src/ui/gui/descriptives.ui +++ b/src/ui/gui/descriptives.ui @@ -286,7 +286,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/entry-dialog.ui b/src/ui/gui/entry-dialog.ui index 939e03c359..b45582b1ab 100644 --- a/src/ui/gui/entry-dialog.ui +++ b/src/ui/gui/entry-dialog.ui @@ -45,7 +45,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/examine.ui b/src/ui/gui/examine.ui index 1190c914fe..c51244d343 100644 --- a/src/ui/gui/examine.ui +++ b/src/ui/gui/examine.ui @@ -292,7 +292,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -407,7 +408,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -502,7 +504,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/factor.ui b/src/ui/gui/factor.ui index 8c6251e6d2..c20349e487 100644 --- a/src/ui/gui/factor.ui +++ b/src/ui/gui/factor.ui @@ -199,7 +199,8 @@ - + + vertical True False 5 @@ -598,7 +599,8 @@ - + + vertical True False 5 @@ -630,7 +632,8 @@ 5 5 - + + vertical True False 5 diff --git a/src/ui/gui/find.ui b/src/ui/gui/find.ui index ca5c4cccf7..8f2aab877c 100644 --- a/src/ui/gui/find.ui +++ b/src/ui/gui/find.ui @@ -277,7 +277,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/frequencies.ui b/src/ui/gui/frequencies.ui index acdf881de7..1ef79dae73 100644 --- a/src/ui/gui/frequencies.ui +++ b/src/ui/gui/frequencies.ui @@ -270,7 +270,7 @@ - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -633,7 +633,7 @@ - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -903,7 +903,7 @@ - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/goto-case.ui b/src/ui/gui/goto-case.ui index b4b9abd440..1a48ec260b 100644 --- a/src/ui/gui/goto-case.ui +++ b/src/ui/gui/goto-case.ui @@ -64,7 +64,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/histogram.ui b/src/ui/gui/histogram.ui index 2a6486d9e7..4e374e2daf 100644 --- a/src/ui/gui/histogram.ui +++ b/src/ui/gui/histogram.ui @@ -159,7 +159,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/indep-samples.ui b/src/ui/gui/indep-samples.ui index cbf01714ba..b072014686 100644 --- a/src/ui/gui/indep-samples.ui +++ b/src/ui/gui/indep-samples.ui @@ -217,7 +217,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -475,7 +476,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/k-means.ui b/src/ui/gui/k-means.ui index 8de5538bbf..06a5021c5d 100644 --- a/src/ui/gui/k-means.ui +++ b/src/ui/gui/k-means.ui @@ -153,7 +153,8 @@ - + + horizontal True False 5 diff --git a/src/ui/gui/k-related.ui b/src/ui/gui/k-related.ui index 4f93eb15bd..40175795e9 100644 --- a/src/ui/gui/k-related.ui +++ b/src/ui/gui/k-related.ui @@ -190,7 +190,8 @@ - + + horizontal True False 5 diff --git a/src/ui/gui/ks-one-sample.ui b/src/ui/gui/ks-one-sample.ui index 065149d64a..4d500bd26b 100644 --- a/src/ui/gui/ks-one-sample.ui +++ b/src/ui/gui/ks-one-sample.ui @@ -233,7 +233,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/logistic.ui b/src/ui/gui/logistic.ui index a48c1e2f98..b226eedb35 100644 --- a/src/ui/gui/logistic.ui +++ b/src/ui/gui/logistic.ui @@ -180,7 +180,8 @@ - + + vertical True False 5 @@ -411,7 +412,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/means.ui b/src/ui/gui/means.ui index c75535f563..1739191231 100644 --- a/src/ui/gui/means.ui +++ b/src/ui/gui/means.ui @@ -192,7 +192,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/missing-val-dialog.ui b/src/ui/gui/missing-val-dialog.ui index a736895479..b9360fb196 100644 --- a/src/ui/gui/missing-val-dialog.ui +++ b/src/ui/gui/missing-val-dialog.ui @@ -47,7 +47,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/oneway.ui b/src/ui/gui/oneway.ui index 4e6b3d5001..02720a42ec 100644 --- a/src/ui/gui/oneway.ui +++ b/src/ui/gui/oneway.ui @@ -191,7 +191,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -515,7 +516,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/paired-samples.ui b/src/ui/gui/paired-samples.ui index c21e837bc8..6f86e763fa 100644 --- a/src/ui/gui/paired-samples.ui +++ b/src/ui/gui/paired-samples.ui @@ -158,7 +158,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c index 567a13cc0d..12d474559d 100644 --- a/src/ui/gui/psppire-buttonbox.c +++ b/src/ui/gui/psppire-buttonbox.c @@ -32,12 +32,12 @@ GType psppire_button_flags_get_type (void); -static void psppire_button_box_class_init (PsppireButtonBoxClass *); -static void psppire_button_box_init (PsppireButtonBox *); +static void psppire_button_box_class_init (PsppireButtonboxClass *); +static void psppire_button_box_init (PsppireButtonbox *); GType -psppire_button_box_get_type (void) +psppire_buttonbox_get_type (void) { static GType button_box_type = 0; @@ -45,19 +45,19 @@ psppire_button_box_get_type (void) { static const GTypeInfo button_box_info = { - sizeof (PsppireButtonBoxClass), + sizeof (PsppireButtonboxClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc) psppire_button_box_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (PsppireButtonBox), + sizeof (PsppireButtonbox), 0, (GInstanceInitFunc) psppire_button_box_init, }; button_box_type = g_type_register_static (GTK_TYPE_BUTTON_BOX, - "PsppireButtonBox", &button_box_info, G_TYPE_FLAG_ABSTRACT); + "PsppireButtonbox", &button_box_info, 0); } return button_box_type; @@ -69,11 +69,11 @@ enum { }; static void -set_default (PsppireButtonBox *bb) +set_default (PsppireButtonbox *bb) { int i; - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) if (bb->def == (1 << i)) { gtk_widget_set_can_default (bb->button[i], TRUE); @@ -89,13 +89,13 @@ psppire_buttonbox_set_property (GObject *object, { gint i; guint flags; - PsppireButtonBox *bb = PSPPIRE_BUTTONBOX (object); + PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object); switch (prop_id) { case PROP_BUTTONS: flags = g_value_get_flags (value); - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); break; @@ -119,12 +119,12 @@ psppire_buttonbox_get_property (GObject *object, guint flags = 0; gint i; - PsppireButtonBox *bb = PSPPIRE_BUTTONBOX (object); + PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object); switch (prop_id) { case PROP_BUTTONS: - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) { gboolean visibility; g_object_get (bb->button[i], "visible", &visibility, NULL); @@ -162,7 +162,7 @@ static GParamSpec *button_flags; static GParamSpec *default_flags; static void -psppire_button_box_class_init (PsppireButtonBoxClass *class) +psppire_button_box_class_init (PsppireButtonboxClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); @@ -275,8 +275,6 @@ refresh_clicked (GtkWidget *w, gpointer data) psppire_dialog_reload (dialog); } - - static void help_clicked (GtkWidget *w, gpointer data) { @@ -291,12 +289,10 @@ help_clicked (GtkWidget *w, gpointer data) psppire_dialog_help (dialog); } - - static void on_validity_change (GtkWidget *toplevel, gboolean valid, gpointer data) { - PsppireButtonBox *bb = data; + PsppireButtonbox *bb = data; /* Set the sensitivity of all the 'executive order' buttons */ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_OK]), valid); @@ -319,7 +315,7 @@ on_realize (GtkWidget *buttonbox, gpointer data) } static void -psppire_button_box_init (PsppireButtonBox *bb) +psppire_button_box_init (PsppireButtonbox *bb) { bb->def = PSPPIRE_BUTTON_CONTINUE; @@ -395,7 +391,7 @@ psppire_button_box_init (PsppireButtonBox *bb) flags = g_value_get_flags (&value); - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); g_value_unset (&value); @@ -405,95 +401,6 @@ psppire_button_box_init (PsppireButtonBox *bb) g_signal_connect (bb, "realize", G_CALLBACK (on_realize), NULL); } - -/* This function was lifted verbatim from the Gtk2.10.6 library. - But later modified to fit Gtk2.24 - */ -void -_psppire_button_box_child_requisition (GtkWidget *widget, - int *nvis_children, - int *nvis_secondaries, - int *width, - int *height) -{ - GtkButtonBox *bbox; - GList *children; - gint nchildren; - gint nsecondaries; - gint needed_width; - gint needed_height; - GtkRequisition child_requisition; - gint ipad_w; - gint ipad_h; - gint width_default; - gint height_default; - gint ipad_x_default; - gint ipad_y_default; - - gint child_min_width; - gint child_min_height; - gint ipad_x; - gint ipad_y; - - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - - bbox = GTK_BUTTON_BOX (widget); - - gtk_widget_style_get (widget, - "child-min-width", &width_default, - "child-min-height", &height_default, - "child-internal-pad-x", &ipad_x_default, - "child-internal-pad-y", &ipad_y_default, - NULL); - - child_min_width = width_default; - child_min_height = height_default; - ipad_x = ipad_x_default; - ipad_y = ipad_y_default; - - nchildren = 0; - nsecondaries = 0; - - needed_width = child_min_width; - needed_height = child_min_height; - ipad_w = ipad_x * 2; - ipad_h = ipad_y * 2; - - children = gtk_container_get_children (GTK_CONTAINER (bbox)); - while (children) - { - GtkWidget *child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child)) - { - gboolean is_secondary = FALSE; - nchildren += 1; - gtk_widget_get_preferred_size (child, NULL, &child_requisition); - - if (child_requisition.width + ipad_w > needed_width) - needed_width = child_requisition.width + ipad_w; - if (child_requisition.height + ipad_h > needed_height) - needed_height = child_requisition.height + ipad_h; - - gtk_container_child_get (GTK_CONTAINER (bbox), child, "secondary", &is_secondary, NULL); - - if (is_secondary) - nsecondaries++; - } - } - - if (nvis_children) - *nvis_children = nchildren; - if (nvis_secondaries) - *nvis_secondaries = nsecondaries; - if (width) - *width = needed_width; - if (height) - *height = needed_height; -} - - GType psppire_button_flags_get_type (void) { diff --git a/src/ui/gui/psppire-buttonbox.h b/src/ui/gui/psppire-buttonbox.h index dc6eb5cf31..d4b53787b3 100644 --- a/src/ui/gui/psppire-buttonbox.h +++ b/src/ui/gui/psppire-buttonbox.h @@ -25,15 +25,16 @@ G_BEGIN_DECLS -#define PSPPIRE_BUTTONBOX_TYPE (psppire_button_box_get_type ()) -#define PSPPIRE_BUTTONBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonBox)) -#define PSPPIRE_BUTTONBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonBoxClass)) +#define PSPPIRE_BUTTONBOX_TYPE (psppire_buttonbox_get_type ()) +#define PSPPIRE_BUTTONBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonbox)) +#define PSPPIRE_BUTTONBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_BUTTONBOX_TYPE, PsppireButtonboxClass)) #define PSPPIRE_IS_BUTTONBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_BUTTONBOX_TYPE)) #define PSPPIRE_IS_BUTTONBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_BUTTONBOX_TYPE)) -typedef struct _PsppireButtonBox PsppireButtonBox; -typedef struct _PsppireButtonBoxClass PsppireButtonBoxClass; +typedef struct _PsppireButtonbox PsppireButtonbox; +typedef struct _PsppireButtonboxClass PsppireButtonboxClass; + enum { @@ -45,33 +46,26 @@ enum PSPPIRE_BUTTON_HELP, PSPPIRE_BUTTON_RESET, PSPPIRE_BUTTON_PASTE, - n_PsppireButtonBoxButtons + n_PsppireButtonboxButtons }; -struct _PsppireButtonBox + +struct _PsppireButtonbox { GtkButtonBox parent; /* */ - GtkWidget *button[n_PsppireButtonBoxButtons]; + GtkWidget *button[n_PsppireButtonboxButtons]; guint def; }; -struct _PsppireButtonBoxClass +struct _PsppireButtonboxClass { GtkButtonBoxClass parent_class; }; -GType psppire_button_box_get_type (void); - +GType psppire_buttonbox_get_type (void); -/* Internal function. Do not use */ -void -_psppire_button_box_child_requisition (GtkWidget *widget, - int *nvis_children, - int *nvis_secondaries, - int *width, - int *height); #define PSPPIRE_TYPE_BUTTON_MASK psppire_button_flags_get_type() diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c deleted file mode 100644 index 93f8990e6f..0000000000 --- a/src/ui/gui/psppire-hbuttonbox.c +++ /dev/null @@ -1,293 +0,0 @@ -/* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2010, 2011 Free Software Foundation - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#include - -#include -#include -#include "psppire-hbuttonbox.h" -#include "psppire-dialog.h" - -#include - -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid - - -static void psppire_hbuttonbox_class_init (PsppireHButtonBoxClass *); -static void psppire_hbuttonbox_init (PsppireHButtonBox *); - -static void gtk_hbutton_box_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_hbutton_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -static void -psppire_hbutton_box_get_preferred_height (GtkWidget *widget, - gint *minimal_height, - gint *natural_height) -{ - GtkRequisition requisition; - - gtk_hbutton_box_size_request (widget, &requisition); - - *minimal_height = *natural_height = requisition.height; -} - - -static void -psppire_hbutton_box_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width) -{ - GtkRequisition requisition; - - gtk_hbutton_box_size_request (widget, &requisition); - - *minimal_width = *natural_width = requisition.width; -} - - - - -GType -psppire_hbutton_box_get_type (void) -{ - static GType hbuttonbox_type = 0; - - if (!hbuttonbox_type) - { - static const GTypeInfo hbuttonbox_info = - { - sizeof (PsppireHButtonBoxClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) psppire_hbuttonbox_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PsppireHButtonBox), - 0, - (GInstanceInitFunc) psppire_hbuttonbox_init, - }; - - hbuttonbox_type = g_type_register_static (PSPPIRE_BUTTONBOX_TYPE, - "PsppireHButtonBox", &hbuttonbox_info, 0); - } - - return hbuttonbox_type; -} - -static void -psppire_hbuttonbox_class_init (PsppireHButtonBoxClass *class) -{ - GtkWidgetClass *widget_class; - - widget_class = (GtkWidgetClass*) class; - - widget_class->get_preferred_width = psppire_hbutton_box_get_preferred_width; - widget_class->get_preferred_height = psppire_hbutton_box_get_preferred_height; - widget_class->size_allocate = gtk_hbutton_box_size_allocate; -} - - -static void -psppire_hbuttonbox_init (PsppireHButtonBox *hbuttonbox) -{ -} - - -GtkWidget* -psppire_hbuttonbox_new (void) -{ - PsppireHButtonBox *hbuttonbox ; - - hbuttonbox = g_object_new (psppire_hbutton_box_get_type (), NULL); - - return GTK_WIDGET (hbuttonbox) ; -} - - - -/* The following two functions are lifted verbatim from - the Gtk2.10.6 library */ - -static void -gtk_hbutton_box_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkBox *box; - GtkButtonBox *bbox; - gint nvis_children; - gint child_width; - gint child_height; - gint spacing; - GtkButtonBoxStyle layout; - - box = GTK_BOX (widget); - bbox = GTK_BUTTON_BOX (widget); - - spacing = gtk_box_get_spacing (box); - layout = gtk_button_box_get_layout (bbox) ; - - _psppire_button_box_child_requisition (widget, - &nvis_children, - NULL, - &child_width, - &child_height); - - if (nvis_children == 0) - { - requisition->width = 0; - requisition->height = 0; - } - else - { - switch (layout) - { - case GTK_BUTTONBOX_SPREAD: - requisition->width = - nvis_children*child_width + ((nvis_children+1)*spacing); - break; - default: - case GTK_BUTTONBOX_EDGE: - case GTK_BUTTONBOX_START: - case GTK_BUTTONBOX_END: - requisition->width = nvis_children*child_width + ((nvis_children-1)*spacing); - break; - } - - requisition->height = child_height; - } - - requisition->width += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; - requisition->height += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; -} - - - -static void -gtk_hbutton_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkBox *base_box; - GtkButtonBox *box; - GList *children; - GtkAllocation child_allocation; - gint nvis_children; - gint n_secondaries; - gint child_width; - gint child_height; - gint x = 0; - gint secondary_x = 0; - gint y = 0; - gint width; - gint childspace; - gint childspacing = 0; - GtkButtonBoxStyle layout; - gint spacing; - - base_box = GTK_BOX (widget); - box = GTK_BUTTON_BOX (widget); - spacing = gtk_box_get_spacing (base_box); - layout = gtk_button_box_get_layout (box) ; - _psppire_button_box_child_requisition (widget, - &nvis_children, - &n_secondaries, - &child_width, - &child_height); - gtk_widget_set_allocation (widget, allocation); - width = allocation->width - gtk_container_get_border_width (GTK_CONTAINER (box))*2; - switch (layout) - { - case GTK_BUTTONBOX_SPREAD: - childspacing = (width - (nvis_children * child_width)) / (nvis_children + 1); - x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing; - secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing)); - break; - default: - case GTK_BUTTONBOX_EDGE: - if (nvis_children >= 2) - { - childspacing = (width - (nvis_children * child_width)) / (nvis_children - 1); - x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing)); - } - else - { - /* one or zero children, just center */ - childspacing = width; - x = secondary_x = allocation->x + (allocation->width - child_width) / 2; - } - break; - case GTK_BUTTONBOX_START: - childspacing = spacing; - x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_x = allocation->x + allocation->width - - child_width * n_secondaries - - spacing * (n_secondaries - 1) - - gtk_container_get_border_width (GTK_CONTAINER (box)); - break; - case GTK_BUTTONBOX_END: - childspacing = spacing; - x = allocation->x + allocation->width - - child_width * (nvis_children - n_secondaries) - - spacing * (nvis_children - n_secondaries - 1) - - gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); - break; - } - - - y = allocation->y + (allocation->height - child_height) / 2; - childspace = child_width + childspacing; - - children = gtk_container_get_children (GTK_CONTAINER (box)); - - while (children) - { - GtkWidget *child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child)) - { - gboolean is_secondary = FALSE; - gtk_container_child_get (GTK_CONTAINER (box), child, "secondary", &is_secondary, NULL); - - - child_allocation.width = child_width; - child_allocation.height = child_height; - child_allocation.y = y; - - if (is_secondary) - { - child_allocation.x = secondary_x; - secondary_x += childspace; - } - else - { - child_allocation.x = x; - x += childspace; - } - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - child_allocation.x = (allocation->x + allocation->width) - (child_allocation.x + child_width - allocation->x); - - gtk_widget_size_allocate (child, &child_allocation); - } - } -} diff --git a/src/ui/gui/psppire-hbuttonbox.h b/src/ui/gui/psppire-hbuttonbox.h deleted file mode 100644 index 6d63d2b8ad..0000000000 --- a/src/ui/gui/psppire-hbuttonbox.h +++ /dev/null @@ -1,54 +0,0 @@ -/* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#ifndef __PSPPIRE_HBBOX_H__ -#define __PSPPIRE_HBBOX_H__ - - -#include -#include -#include "psppire-buttonbox.h" - -G_BEGIN_DECLS - -#define PSPPIRE_HBUTTON_BOX_TYPE (psppire_hbutton_box_get_type ()) -#define PSPPIRE_HBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_HBUTTON_BOX_TYPE, PsppireHButtonBox)) -#define PSPPIRE_HBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_HBUTTON_BOX_TYPE, PsppireHButtonBoxClass)) -#define PSPPIRE_IS_HBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_HBUTTON_BOX_TYPE)) -#define PSPPIRE_IS_HBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_HBUTTON_BOX_TYPE)) - - -typedef struct _PsppireHButtonBox PsppireHButtonBox; -typedef struct _PsppireHButtonBoxClass PsppireHButtonBoxClass; - -struct _PsppireHButtonBox -{ - PsppireButtonBox parent; -}; - -struct _PsppireHButtonBoxClass -{ - PsppireButtonBoxClass parent_class; -}; - -GType psppire_hbutton_box_get_type (void); -GtkWidget* psppire_hbutton_box_new (void); - -G_END_DECLS - -#endif /* __PSPPIRE_HBBOX_H__ */ - diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c deleted file mode 100644 index 72e6585689..0000000000 --- a/src/ui/gui/psppire-vbuttonbox.c +++ /dev/null @@ -1,286 +0,0 @@ -/* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2010, 2011 Free Software Foundation - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#include - -#include -#include -#include "psppire-vbuttonbox.h" -#include "psppire-dialog.h" - -#include - -#define _(msgid) gettext (msgid) -#define N_(msgid) msgid - - -static void psppire_vbuttonbox_class_init (PsppireVButtonBoxClass *); -static void psppire_vbuttonbox_init (PsppireVButtonBox *); - -static void gtk_vbutton_box_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_vbutton_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -static void -psppire_vbutton_box_get_preferred_height (GtkWidget *widget, - gint *minimal_height, - gint *natural_height) -{ - GtkRequisition requisition; - - gtk_vbutton_box_size_request (widget, &requisition); - - *minimal_height = *natural_height = requisition.height; -} - - -static void -psppire_vbutton_box_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width) -{ - GtkRequisition requisition; - - gtk_vbutton_box_size_request (widget, &requisition); - - *minimal_width = *natural_width = requisition.width; -} - - -GType -psppire_vbutton_box_get_type (void) -{ - static GType vbuttonbox_type = 0; - - if (!vbuttonbox_type) - { - static const GTypeInfo vbuttonbox_info = - { - sizeof (PsppireVButtonBoxClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) psppire_vbuttonbox_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PsppireVButtonBox), - 0, - (GInstanceInitFunc) psppire_vbuttonbox_init, - }; - - vbuttonbox_type = g_type_register_static (PSPPIRE_BUTTONBOX_TYPE, - "PsppireVButtonBox", &vbuttonbox_info, 0); - } - - return vbuttonbox_type; -} - -static void -psppire_vbuttonbox_class_init (PsppireVButtonBoxClass *class) -{ - GtkWidgetClass *widget_class; - - widget_class = (GtkWidgetClass*) class; - - widget_class->get_preferred_width = psppire_vbutton_box_get_preferred_width; - widget_class->get_preferred_height = psppire_vbutton_box_get_preferred_height; - widget_class->size_allocate = gtk_vbutton_box_size_allocate; -} - - -static void -psppire_vbuttonbox_init (PsppireVButtonBox *vbuttonbox) -{ -} - - -GtkWidget* -psppire_vbuttonbox_new (void) -{ - PsppireVButtonBox *vbuttonbox ; - - vbuttonbox = g_object_new (psppire_vbutton_box_get_type (), NULL); - - return GTK_WIDGET (vbuttonbox) ; -} - - - -/* The following two functions are lifted verbatim from - the Gtk2.10.6 library */ - -static void -gtk_vbutton_box_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkBox *box; - GtkButtonBox *bbox; - gint nvis_children; - gint child_width; - gint child_height; - gint spacing; - GtkButtonBoxStyle layout; - - box = GTK_BOX (widget); - bbox = GTK_BUTTON_BOX (widget); - - spacing = gtk_box_get_spacing (box); - layout = gtk_button_box_get_layout (bbox); - - _psppire_button_box_child_requisition (widget, - &nvis_children, - NULL, - &child_width, - &child_height); - - if (nvis_children == 0) - { - requisition->width = 0; - requisition->height = 0; - } - else - { - switch (layout) - { - case GTK_BUTTONBOX_SPREAD: - requisition->height = - nvis_children*child_height + ((nvis_children+1)*spacing); - break; - case GTK_BUTTONBOX_EDGE: - case GTK_BUTTONBOX_START: - case GTK_BUTTONBOX_END: - default: - requisition->height = - nvis_children*child_height + ((nvis_children-1)*spacing); - break; - } - requisition->width = child_width; - } - - requisition->width += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; - requisition->height += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; -} - - - -static void -gtk_vbutton_box_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkBox *base_box; - GtkButtonBox *box; - GList *children; - GtkAllocation child_allocation; - gint nvis_children; - gint n_secondaries; - gint child_width; - gint child_height; - gint x = 0; - gint y = 0; - gint secondary_y = 0; - gint height; - gint childspace; - gint childspacing = 0; - GtkButtonBoxStyle layout; - gint spacing; - - base_box = GTK_BOX (widget); - box = GTK_BUTTON_BOX (widget); - spacing = gtk_box_get_spacing (base_box); - layout = gtk_button_box_get_layout (box) ; - _psppire_button_box_child_requisition (widget, - &nvis_children, - &n_secondaries, - &child_width, - &child_height); - gtk_widget_set_allocation (widget, allocation); - height = allocation->height - gtk_container_get_border_width (GTK_CONTAINER (box))*2; - switch (layout) - { - case GTK_BUTTONBOX_SPREAD: - childspacing = (height - (nvis_children * child_height)) / (nvis_children + 1); - y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing; - secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing)); - break; - case GTK_BUTTONBOX_EDGE: - default: - if (nvis_children >= 2) - { - childspacing = (height - (nvis_children*child_height)) / (nvis_children-1); - y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing)); - } - else - { - /* one or zero children, just center */ - childspacing = height; - y = secondary_y = allocation->y + (allocation->height - child_height) / 2; - } - break; - case GTK_BUTTONBOX_START: - childspacing = spacing; - y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_y = allocation->y + allocation->height - - child_height * n_secondaries - - spacing * (n_secondaries - 1) - - gtk_container_get_border_width (GTK_CONTAINER (box)); - break; - case GTK_BUTTONBOX_END: - childspacing = spacing; - y = allocation->y + allocation->height - - child_height * (nvis_children - n_secondaries) - - spacing * (nvis_children - n_secondaries - 1) - - gtk_container_get_border_width (GTK_CONTAINER (box)); - secondary_y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); - break; - } - - x = allocation->x + (allocation->width - child_width) / 2; - childspace = child_height + childspacing; - - children = gtk_container_get_children (GTK_CONTAINER (box)); - while (children) - { - GtkWidget *child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child)) - { - gboolean is_secondary = FALSE; - gtk_container_child_get (GTK_CONTAINER (box), child, "secondary", &is_secondary, NULL); - - child_allocation.width = child_width; - child_allocation.height = child_height; - child_allocation.x = x; - - if (is_secondary) - { - child_allocation.y = secondary_y; - secondary_y += childspace; - } - else - { - child_allocation.y = y; - y += childspace; - } - - gtk_widget_size_allocate (child, &child_allocation); - } - } -} - diff --git a/src/ui/gui/psppire-vbuttonbox.h b/src/ui/gui/psppire-vbuttonbox.h deleted file mode 100644 index 01da4749c4..0000000000 --- a/src/ui/gui/psppire-vbuttonbox.h +++ /dev/null @@ -1,54 +0,0 @@ -/* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - - -#ifndef __PSPPIRE_VBBOX_H__ -#define __PSPPIRE_VBBOX_H__ - - -#include -#include -#include "psppire-buttonbox.h" - -G_BEGIN_DECLS - -#define PSPPIRE_VBUTTON_BOX_TYPE (psppire_vbutton_box_get_type ()) -#define PSPPIRE_VBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_VBUTTON_BOX_TYPE, PsppireVButtonBox)) -#define PSPPIRE_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_VBUTTON_BOX_TYPE, PsppireVButtonBoxClass)) -#define PSPPIRE_IS_VBUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_VBUTTON_BOX_TYPE)) -#define PSPPIRE_IS_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_VBUTTON_BOX_TYPE)) - - -typedef struct _PsppireVButtonBox PsppireVButtonBox; -typedef struct _PsppireVButtonBoxClass PsppireVButtonBoxClass; - -struct _PsppireVButtonBox -{ - PsppireButtonBox parent; -}; - -struct _PsppireVButtonBoxClass -{ - PsppireButtonBoxClass parent_class; -}; - -GType psppire_vbutton_box_get_type (void); -GtkWidget* psppire_vbutton_box_new (void); - -G_END_DECLS - -#endif /* __PSPPIRE_VBBOX_H__ */ - diff --git a/src/ui/gui/rank.ui b/src/ui/gui/rank.ui index 8124cb2cdb..b1afc0e4c3 100644 --- a/src/ui/gui/rank.ui +++ b/src/ui/gui/rank.ui @@ -328,7 +328,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -715,7 +716,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -865,7 +867,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/recode.ui b/src/ui/gui/recode.ui index c25065f5e1..ee31002c81 100644 --- a/src/ui/gui/recode.ui +++ b/src/ui/gui/recode.ui @@ -343,7 +343,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -402,7 +403,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/regression.ui b/src/ui/gui/regression.ui index 5aaa37fb21..d7aa7d1867 100644 --- a/src/ui/gui/regression.ui +++ b/src/ui/gui/regression.ui @@ -233,7 +233,8 @@ - + + vertical True False 5 @@ -309,7 +310,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -384,7 +386,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/reliability.ui b/src/ui/gui/reliability.ui index 8bd36c67dc..6c7072af82 100644 --- a/src/ui/gui/reliability.ui +++ b/src/ui/gui/reliability.ui @@ -263,7 +263,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/roc.ui b/src/ui/gui/roc.ui index 39f47e14a1..f08322ff12 100644 --- a/src/ui/gui/roc.ui +++ b/src/ui/gui/roc.ui @@ -336,7 +336,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/runs.ui b/src/ui/gui/runs.ui index 6a0de6a6c3..a729904ad3 100644 --- a/src/ui/gui/runs.ui +++ b/src/ui/gui/runs.ui @@ -231,7 +231,8 @@ - + + horizontal True False 5 diff --git a/src/ui/gui/scatterplot.ui b/src/ui/gui/scatterplot.ui index 77d67af732..6cc59b2882 100644 --- a/src/ui/gui/scatterplot.ui +++ b/src/ui/gui/scatterplot.ui @@ -182,7 +182,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/select-cases.ui b/src/ui/gui/select-cases.ui index 1e4cf46025..6eb7bda8a3 100644 --- a/src/ui/gui/select-cases.ui +++ b/src/ui/gui/select-cases.ui @@ -121,7 +121,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -654,7 +655,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -748,7 +750,8 @@ - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/sort.ui b/src/ui/gui/sort.ui index 15aad1227f..6773c33932 100644 --- a/src/ui/gui/sort.ui +++ b/src/ui/gui/sort.ui @@ -215,7 +215,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/split-file.ui b/src/ui/gui/split-file.ui index 48fa19544c..dde80d624f 100644 --- a/src/ui/gui/split-file.ui +++ b/src/ui/gui/split-file.ui @@ -352,7 +352,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/t-test.ui b/src/ui/gui/t-test.ui index e5ebe735d2..6230f11d35 100644 --- a/src/ui/gui/t-test.ui +++ b/src/ui/gui/t-test.ui @@ -105,7 +105,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -140,7 +141,8 @@ 5 5 - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/transpose.ui b/src/ui/gui/transpose.ui index 006847d08f..3b62febd03 100644 --- a/src/ui/gui/transpose.ui +++ b/src/ui/gui/transpose.ui @@ -203,7 +203,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/univariate.ui b/src/ui/gui/univariate.ui index 41679de0b6..79774e9af9 100644 --- a/src/ui/gui/univariate.ui +++ b/src/ui/gui/univariate.ui @@ -63,7 +63,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -137,7 +138,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -329,7 +331,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/val-labs-dialog.ui b/src/ui/gui/val-labs-dialog.ui index 307d728696..e3dbc185ec 100644 --- a/src/ui/gui/val-labs-dialog.ui +++ b/src/ui/gui/val-labs-dialog.ui @@ -188,7 +188,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/var-type-dialog.ui b/src/ui/gui/var-type-dialog.ui index 1701ea299c..69383b49df 100644 --- a/src/ui/gui/var-type-dialog.ui +++ b/src/ui/gui/var-type-dialog.ui @@ -400,7 +400,8 @@ - + + vertical True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/variable-info.ui b/src/ui/gui/variable-info.ui index a74dc9de95..761c297b87 100644 --- a/src/ui/gui/variable-info.ui +++ b/src/ui/gui/variable-info.ui @@ -51,7 +51,8 @@ vertical 5 - + + horizontal True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/ui/gui/weight.ui b/src/ui/gui/weight.ui index 171ce963ff..9ee4e46ef3 100644 --- a/src/ui/gui/weight.ui +++ b/src/ui/gui/weight.ui @@ -223,7 +223,8 @@ - + + vertical True False 5 diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c index b9a7a1ec3e..b6948d9414 100644 --- a/src/ui/gui/widgets.c +++ b/src/ui/gui/widgets.c @@ -7,8 +7,7 @@ #include "psppire-dialog.h" #include "psppire-selector.h" -#include "psppire-vbuttonbox.h" -#include "psppire-hbuttonbox.h" +#include "psppire-buttonbox.h" #include "psppire-keypad.h" #include "psppire-acr.h" #include "psppire-dictview.h" @@ -131,8 +130,7 @@ preregister_widgets (void) psppire_val_chooser_get_type (); psppire_dialog_get_type (); psppire_selector_get_type (); - psppire_vbutton_box_get_type (); - psppire_hbutton_box_get_type (); + psppire_buttonbox_get_type (); psppire_keypad_get_type (); psppire_acr_get_type (); psppire_dict_view_get_type (); -- 2.30.2