Commit 49814849 authored by Roman Lebedev's avatar Roman Lebedev

GTK3: GtkVBox is deprecated

parent bcf28060
......@@ -321,10 +321,10 @@ typedef struct dt_iop_gui_blend_data_t
GList *masks_invert;
GList *blend_modes_all;
GtkWidget *iopw;
GtkVBox *top_box;
GtkVBox *bottom_box;
GtkVBox *blendif_box;
GtkVBox *masks_box;
GtkBox *top_box;
GtkBox *bottom_box;
GtkBox *blendif_box;
GtkBox *masks_box;
GtkDarktableGradientSlider *upper_slider;
GtkDarktableGradientSlider *lower_slider;
GtkLabel *upper_label[8];
......@@ -387,7 +387,7 @@ int dt_develop_blend_legacy_params(dt_iop_module_t *module, const void *const ol
const int lenght);
/** gui related stuff */
void dt_iop_gui_init_blendif(GtkVBox *blendw, dt_iop_module_t *module);
void dt_iop_gui_init_blendif(GtkBox *blendw, dt_iop_module_t *module);
void dt_iop_gui_init_blending(GtkWidget *iopw, dt_iop_module_t *module);
void dt_iop_gui_update_blending(dt_iop_module_t *module);
void dt_iop_gui_update_blendif(dt_iop_module_t *module);
......
......@@ -936,7 +936,7 @@ void dt_iop_gui_update_blendif(dt_iop_module_t *module)
}
void dt_iop_gui_init_blendif(GtkVBox *blendw, dt_iop_module_t *module)
void dt_iop_gui_init_blendif(GtkBox *blendw, dt_iop_module_t *module)
{
dt_iop_gui_blend_data_t *bd = (dt_iop_gui_blend_data_t *)module->blend_data;
......@@ -1237,7 +1237,7 @@ void dt_iop_gui_update_masks(dt_iop_module_t *module)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bd->masks_brush), b5);
}
void dt_iop_gui_init_masks(GtkVBox *blendw, dt_iop_module_t *module)
void dt_iop_gui_init_masks(GtkBox *blendw, dt_iop_module_t *module)
{
dt_iop_gui_blend_data_t *bd = (dt_iop_gui_blend_data_t *)module->blend_data;
......
......@@ -51,7 +51,7 @@ typedef struct dt_iop_bloom_params_t
typedef struct dt_iop_bloom_gui_data_t
{
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *label1, *label2, *label3; // size,threshold,strength
GtkWidget *scale1, *scale2, *scale3; // size,threshold,strength
} dt_iop_bloom_gui_data_t;
......
......@@ -87,7 +87,7 @@ typedef struct dt_iop_channelmixer_params_t
typedef struct dt_iop_channelmixer_gui_data_t
{
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *combo1; // Output channel
GtkDarktableLabel *dtlabel1, *dtlabel2; // output channel, source channels
GtkLabel *label1, *label2, *label3; // red, green, blue
......
......@@ -47,7 +47,7 @@ typedef struct dt_iop_rlce_params_t
typedef struct dt_iop_rlce_gui_data_t
{
GtkVBox *vbox1, *vbox2;
GtkBox *vbox1, *vbox2;
GtkWidget *label1, *label2;
GtkDarktableSlider *scale1, *scale2; // radie pixels, slope
} dt_iop_rlce_gui_data_t;
......
......@@ -57,7 +57,7 @@ typedef struct dt_iop_colorcontrast_gui_data_t
{
// whatever you need to make your gui happy.
// stored in self->gui_data
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *a_scale; // this is needed by gui_update
GtkWidget *b_scale;
} dt_iop_colorcontrast_gui_data_t;
......
......@@ -109,7 +109,7 @@ void init_presets(dt_iop_module_so_t *self)
typedef struct dt_iop_graduatednd_gui_data_t
{
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *label1, *label2, *label3, *label5, *label6; // density, compression, rotation, hue, saturation
GtkWidget *scale1, *scale2, *scale3; // density, compression, rotation
GtkWidget *gslider1, *gslider2; // hue, saturation
......
......@@ -64,7 +64,7 @@ typedef struct dt_iop_grain_params_t
typedef struct dt_iop_grain_gui_data_t
{
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *label1, *label2, *label3; // channel, scale, strength
GtkWidget *scale1, *scale2; // scale, strength
} dt_iop_grain_gui_data_t;
......
......@@ -54,7 +54,7 @@ typedef struct dt_iop_highpass_params_t
typedef struct dt_iop_highpass_gui_data_t
{
GtkVBox *vbox1, *vbox2;
GtkBox *vbox1, *vbox2;
GtkWidget *label1, *label2; // sharpness,contrast
GtkWidget *scale1, *scale2; // sharpness,contrast
} dt_iop_highpass_gui_data_t;
......
......@@ -64,7 +64,7 @@ void init_presets(dt_iop_module_so_t *self)
typedef struct dt_iop_relight_gui_data_t
{
GtkVBox *vbox1, *vbox2; // left and right controlboxes
GtkBox *vbox1, *vbox2; // left and right controlboxes
GtkLabel *label1, *label2, *label3; // ev, center, width
GtkWidget *scale1, *scale2; // ev,width
GtkDarktableGradientSlider *gslider1; // center
......
......@@ -59,7 +59,7 @@ typedef struct dt_iop_soften_params_t
typedef struct dt_iop_soften_gui_data_t
{
GtkVBox *vbox1, *vbox2;
GtkBox *vbox1, *vbox2;
GtkWidget *scale1, *scale2, *scale3, *scale4; // size,saturation,brightness,amount
} dt_iop_soften_gui_data_t;
......
......@@ -58,7 +58,7 @@ typedef struct dt_iop_velvia_params1_t
typedef struct dt_iop_velvia_gui_data_t
{
GtkVBox *vbox;
GtkBox *vbox;
GtkWidget *strength_scale;
GtkWidget *bias_scale;
} dt_iop_velvia_gui_data_t;
......
......@@ -10,8 +10,8 @@
GtkWidget *widget, *label, *labelev, *viewport;
GtkRequisition size;
GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
GtkWidget *vbox1 = gtk_vbox_new(5, TRUE);
GtkWidget *vbox2 = gtk_vbox_new(5, TRUE);
GtkWidget *vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
GtkWidget *vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
char tooltip[1024];
gtk_box_pack_start(GTK_BOX(hbox), vbox1, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment