summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-08-05 18:03:58 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-08-05 18:03:58 +0000
commit27a54dc22bb9b2fbb16b01a04cd8479d25470bec (patch)
treef0958765864515c2983279047c21be116424a25a
parent7e59022ea4be11a1ac99a7e4066ac39f8dffd99c (diff)
Fl_Text_Display::resize() should be public...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2564 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--FL/Fl_Text_Display.H7
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 3f2560011..6b11d6cc4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.0
- Documentation updates.
+ - The Fl_Text_Display::resize() method was incorrectly
+ flagged as protected.
- Fixed some memory/initialization bugs in
Fl_File_Chooser that valgrind caught.
- The PNG library png_read_destroy() is deprecated and
diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index 575748758..60c90115e 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Text_Display.H,v 1.4.2.8 2002/06/09 18:28:48 easysw Exp $"
+// "$Id: Fl_Text_Display.H,v 1.4.2.9 2002/08/05 18:03:58 easysw Exp $"
//
// Header file for Fl_Text_Display class.
//
@@ -117,12 +117,13 @@ class Fl_Text_Display: public Fl_Group {
Fl_Color textcolor() const {return (Fl_Color)textcolor_;}
void textcolor(unsigned n) {textcolor_ = n;}
+ FL_EXPORT virtual void resize(int X, int Y, int W, int H);
+
protected:
// Most (all?) of this stuff should only be called from resize() or
// draw().
// Anything with "vline" indicates thats it deals with currently
// visible lines.
- FL_EXPORT virtual void resize(int X, int Y, int W, int H);
FL_EXPORT virtual void draw();
FL_EXPORT void draw_text(int X, int Y, int W, int H);
@@ -242,5 +243,5 @@ class Fl_Text_Display: public Fl_Group {
#endif
//
-// End of "$Id: Fl_Text_Display.H,v 1.4.2.8 2002/06/09 18:28:48 easysw Exp $".
+// End of "$Id: Fl_Text_Display.H,v 1.4.2.9 2002/08/05 18:03:58 easysw Exp $".
//