- _top_crop->add (crop, wxGBPosition (cr, 1));
- add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
- _bottom_crop->add (crop, wxGBPosition (cr, 3));
- _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
- r += 2;
-
- _fade_in_label->Show (full);
- _fade_in->Show (full);
- _fade_out_label->Show (full);
- _fade_out->Show (full);
- _scale_to_label->Show (full);
- _scale->show (full);
- _filters_label->Show (full);
- _filters->Show (full);
- _filters_button->Show (full);
- _colour_conversion_label->Show (full);
- _colour_conversion->Show (full);
- _edit_colour_conversion_button->Show (full);
-
- if (full) {
- add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
-
- add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
-
- add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
- _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
- ++r;
-
- add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0));
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- }
- ++r;
-
- add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
- {
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- }
- ++r;
+ _top_crop->add (crop, wxGBPosition (cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#ifdef __WXGTK3__
+ crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
+ ++cr;
+ add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition(cr, 0));
+ _bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#else
+ crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3));
+ _bottom_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#endif
+ add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
+ _grid->Add (crop, wxGBPosition(r, 1));
+ ++r;
+
+ add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
+
+ add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
+
+ add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+ {
+ auto v = new wxBoxSizer (wxVERTICAL);
+ v->Add (_scale_fit, 0, wxBOTTOM, 4);
+ auto h = new wxBoxSizer (wxHORIZONTAL);
+ h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
+ h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
+ v->Add (h, 0);
+ _grid->Add (v, wxGBPosition(r, 1));