/[svn]/gigedit/trunk/src/gigedit/dimregionedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionedit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC revision 3368 by schoenebeck, Thu Nov 16 19:18:42 2017 UTC
# Line 451  DimRegionEdit::DimRegionEdit() : Line 451  DimRegionEdit::DimRegionEdit() :
451          table[i]->set_col_spacings(7);          table[i]->set_col_spacings(7);
452  #endif  #endif
453    
454    // on Gtk 3 there is absolutely no margin by default
455    #if GTKMM_MAJOR_VERSION >= 3
456    # if GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12
457            table[i]->set_margin_left(12);
458            table[i]->set_margin_right(12);
459    # else
460            table[i]->set_margin_start(12);
461            table[i]->set_margin_end(12);
462    # endif
463    #endif
464      }      }
465    
466      // set tooltips      // set tooltips
# Line 635  DimRegionEdit::DimRegionEdit() : Line 645  DimRegionEdit::DimRegionEdit() :
645    
646      Gtk::Frame* frame = new Gtk::Frame;      Gtk::Frame* frame = new Gtk::Frame;
647      frame->add(crossfade_curve);      frame->add(crossfade_curve);
648        // on Gtk 3 there is no margin at all by default
649    #if GTKMM_MAJOR_VERSION >= 3
650        frame->set_margin_top(12);
651        frame->set_margin_bottom(12);
652    #endif
653  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
654      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
655  #else  #else
# Line 714  DimRegionEdit::DimRegionEdit() : Line 729  DimRegionEdit::DimRegionEdit() :
729    
730      frame = new Gtk::Frame;      frame = new Gtk::Frame;
731      frame->add(cutoff_curve);      frame->add(cutoff_curve);
732        // on Gtk 3 there is no margin at all by default
733    #if GTKMM_MAJOR_VERSION >= 3
734        frame->set_margin_top(12);
735        frame->set_margin_bottom(12);
736    #endif
737  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
738      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
739  #else  #else
# Line 820  DimRegionEdit::DimRegionEdit() : Line 840  DimRegionEdit::DimRegionEdit() :
840    
841      frame = new Gtk::Frame;      frame = new Gtk::Frame;
842      frame->add(velocity_curve);      frame->add(velocity_curve);
843        // on Gtk 3 there is no margin at all by default
844    #if GTKMM_MAJOR_VERSION >= 3
845        frame->set_margin_top(12);
846        frame->set_margin_bottom(12);
847    #endif
848  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
849      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
850  #else  #else
# Line 840  DimRegionEdit::DimRegionEdit() : Line 865  DimRegionEdit::DimRegionEdit() :
865          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));          sigc::mem_fun(release_curve, &VelocityCurve::queue_draw));
866      frame = new Gtk::Frame;      frame = new Gtk::Frame;
867      frame->add(release_curve);      frame->add(release_curve);
868        // on Gtk 3 there is no margin at all by default
869    #if GTKMM_MAJOR_VERSION >= 3
870        frame->set_margin_top(12);
871        frame->set_margin_bottom(12);
872    #endif
873  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
874      table[pageno]->attach(*frame, 1, rowno, 2);      table[pageno]->attach(*frame, 1, rowno, 2);
875  #else  #else
# Line 1021  Gtk::Label* DimRegionEdit::addHeader(con Line 1051  Gtk::Label* DimRegionEdit::addHeader(con
1051  #else  #else
1052      label->set_halign(Gtk::Align::START);      label->set_halign(Gtk::Align::START);
1053  #endif  #endif
1054        // on GTKMM 3 there is absolutely no margin by default
1055    #if GTKMM_MAJOR_VERSION >= 3
1056        label->set_margin_top(18);
1057        label->set_margin_bottom(13);
1058    #endif
1059  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
1060      table[pageno]->attach(*label, 0, rowno, 3);      table[pageno]->attach(*label, 0, rowno, 3);
1061  #else  #else
Legend:
Removed from v.3364  
changed lines
  Added in v.3368
  ViewVC Help
Powered by ViewVC