From 80278aa78a4188c009e4cdc3c525e14973d616bb Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 5 Feb 2010 18:38:40 -0600 Subject: [PATCH] FL: Get rid of unnecessary call to clip_children(). The idea being to restore compatibility with FLTK 1.1.7... --- FL/Fl_Packscroller.H | 2 -- mixer/src/Controller_Module.C | 3 +++ mixer/src/Module.C | 9 ++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/FL/Fl_Packscroller.H b/FL/Fl_Packscroller.H index 6b4ffce..3e67858 100644 --- a/FL/Fl_Packscroller.H +++ b/FL/Fl_Packscroller.H @@ -41,8 +41,6 @@ public: Fl_Packscroller ( int X, int Y, int W, int H, const char *L = 0 ) : Fl_Group( X, Y, W, H, L ) { - clip_children( 1 ); - _increment = 30; _yposition = 0; diff --git a/mixer/src/Controller_Module.C b/mixer/src/Controller_Module.C index 2a6ebce..17ff0af 100644 --- a/mixer/src/Controller_Module.C +++ b/mixer/src/Controller_Module.C @@ -276,6 +276,9 @@ Controller_Module::connect_to ( Port *p ) } else { + /* HACK: hide label */ + w->labeltype( FL_NO_LABEL ); + w->resize( x(), y(), this->w(), h() ); add( w ); resizable( w ); diff --git a/mixer/src/Module.C b/mixer/src/Module.C index 37d86ab..45aeba6 100644 --- a/mixer/src/Module.C +++ b/mixer/src/Module.C @@ -105,7 +105,6 @@ Module::init ( void ) box( FL_UP_BOX ); labeltype( FL_NO_LABEL ); - clip_children( 1 ); set_visible_focus(); selection_color( FL_RED ); } @@ -320,11 +319,8 @@ Module::draw_box ( void ) ty = y(); tx = x(); -// bbox( tx, ty, tw, th ); - fl_push_clip( tx, ty, tw, th ); - Fl_Color c = is_default() ? FL_BLACK : color(); c = active() && ! bypass() ? c : fl_inactive( c ); @@ -349,10 +345,9 @@ Module::draw_box ( void ) fl_draw_box( FL_ROUNDED_BOX, tx + tw - 8, ty + 4, 5, 5, is_controlling() ? FL_YELLOW : fl_inactive( FL_YELLOW ) ); } - fl_pop_clip(); -// box( FL_NO_BOX ); - Fl_Group::draw_children(); + + fl_pop_clip(); } void