File fltk-delete-fix.patch of Package fltk

Overview Repositories Revisions Requests Users Attributes Meta

File fltk-delete-fix.patch of Package fltk (Revision 205096427f9cc4ef686e022585adf080)

Currently displaying revision 205096427f9cc4ef686e022585adf080 , Show latest

Index: FL/Fl_Browser_.H
===================================================================
--- FL/Fl_Browser_.H.orig
+++ FL/Fl_Browser_.H
@@ -104,8 +104,8 @@ protected:
 
 public:
 
-  Fl_Scrollbar scrollbar;		// Vertical scrollbar
-  Fl_Scrollbar hscrollbar;		// Horizontal scrollbar
+  Fl_Scrollbar &scrollbar;		// Vertical scrollbar
+  Fl_Scrollbar &hscrollbar;		// Horizontal scrollbar
 
   int handle(int);
   void resize(int,int,int,int);
Index: FL/Fl_Help_View.H
===================================================================
--- FL/Fl_Help_View.H.orig
+++ FL/Fl_Help_View.H
@@ -130,8 +130,8 @@ class FL_EXPORT Fl_Help_View : public Fl
 		leftline_,		// Lefthand position
 		size_,			// Total document length
 		hsize_;			// Maximum document width
-  Fl_Scrollbar	scrollbar_,		// Vertical scrollbar for document
-		hscrollbar_;		// Horizontal scrollbar
+  Fl_Scrollbar	&scrollbar_,		// Vertical scrollbar for document
+		&hscrollbar_;		// Horizontal scrollbar
 
   static int    selection_first;
   static int    selection_last;
Index: FL/Fl_Scroll.H
===================================================================
--- FL/Fl_Scroll.H.orig
+++ FL/Fl_Scroll.H
@@ -48,8 +48,8 @@ protected:
 
 public:
 
-  Fl_Scrollbar scrollbar;
-  Fl_Scrollbar hscrollbar;
+  Fl_Scrollbar &scrollbar;
+  Fl_Scrollbar &hscrollbar;
 
   void resize(int,int,int,int);
   int handle(int);
Index: src/Fl_Browser_.cxx
===================================================================
--- src/Fl_Browser_.cxx.orig
+++ src/Fl_Browser_.cxx
@@ -786,8 +786,8 @@ J1:
 
 Fl_Browser_::Fl_Browser_(int X, int Y, int W, int H, const char* l)
   : Fl_Group(X, Y, W, H, l),
-    scrollbar(0, 0, 0, 0, 0), // they will be resized by draw()
-    hscrollbar(0, 0, 0, 0, 0)
+    scrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0)), // they will be resized by draw()
+    hscrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0))
 {
   box(FL_NO_BOX);
   align(FL_ALIGN_BOTTOM);
Index: src/Fl_Help_View.cxx
===================================================================
--- src/Fl_Help_View.cxx.orig
+++ src/Fl_Help_View.cxx
@@ -3051,10 +3051,10 @@ Fl_Help_View::Fl_Help_View(int        xx
 			   int        hh,	// I - Height in pixels
 			   const char *l)
     : Fl_Group(xx, yy, ww, hh, l),
-      scrollbar_(xx + ww - Fl::scrollbar_size(), yy,
-                 Fl::scrollbar_size(), hh - Fl::scrollbar_size()),
-      hscrollbar_(xx, yy + hh - Fl::scrollbar_size(),
-                  ww - Fl::scrollbar_size(), Fl::scrollbar_size())
+      scrollbar_(* new Fl_Scrollbar(xx + ww - Fl::scrollbar_size(), yy,
+                 Fl::scrollbar_size(), hh - Fl::scrollbar_size())),
+      hscrollbar_(* new Fl_Scrollbar(xx, yy + hh - Fl::scrollbar_size(),
+                  ww - Fl::scrollbar_size(), Fl::scrollbar_size()))
 {
   color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
 
Index: src/Fl_Scroll.cxx
===================================================================
--- src/Fl_Scroll.cxx.orig
+++ src/Fl_Scroll.cxx
@@ -276,10 +276,10 @@ void Fl_Scroll::scrollbar_cb(Fl_Widget*
 
 Fl_Scroll::Fl_Scroll(int X,int Y,int W,int H,const char* L)
   : Fl_Group(X,Y,W,H,L), 
-    scrollbar(X+W-Fl::scrollbar_size(),Y,
-              Fl::scrollbar_size(),H-Fl::scrollbar_size()),
-    hscrollbar(X,Y+H-Fl::scrollbar_size(),
-               W-Fl::scrollbar_size(),Fl::scrollbar_size()) {
+    scrollbar(* new Fl_Scrollbar(X+W-Fl::scrollbar_size(),Y,
+              Fl::scrollbar_size(),H-Fl::scrollbar_size())),
+    hscrollbar(* new Fl_Scrollbar(X,Y+H-Fl::scrollbar_size(),
+               W-Fl::scrollbar_size(),Fl::scrollbar_size())) {
   type(BOTH);
   xposition_ = oldx = 0;
   yposition_ = oldy = 0;

Places

File fltk-delete-fix.patch of Package fltk (Revision 205096427f9cc4ef686e022585adf080)

Places