summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--FL/Fl_Help_View.H12
2 files changed, 15 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index f53fe38ae..e4fc78819 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,9 @@ CHANGES IN FLTK 1.3.3 RELEASED: MMM
(To enable the following ABI features, put: #define FLTK_ABI_VERSION 10303
at the top of your FL/Enumerations.H and rebuild FLTK and your app)
+ - Made Fl_Help_View::handle() public and Fl_Help_View::draw() protected
+ to enable inheritance and for consistency (STR #2834).
+ Note: both methods were private.
- Added Fl_Table::tab_cell_nav() for controlling Tab key navigation of table
- Added Fl_Tree::get_selected_items(), returns the selected items as an array
- Added Fl_Tree::item_draw_callback(), letting one define a custom draw function
diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H
index 6e0ea1d4c..a370c3011 100644
--- a/FL/Fl_Help_View.H
+++ b/FL/Fl_Help_View.H
@@ -260,7 +260,13 @@ class FL_EXPORT Fl_Help_View : public Fl_Group { // Help viewer widget
void add_target(const char *n, int yy);
static int compare_targets(const Fl_Help_Target *t0, const Fl_Help_Target *t1);
int do_align(Fl_Help_Block *block, int line, int xx, int a, int &l);
+#if FLTK_ABI_VERSION >= 10303
+protected:
+#endif
void draw();
+#if FLTK_ABI_VERSION >= 10303
+private:
+#endif
void format();
void format_table(int *table_width, int *columns, const char *table);
void free_data();
@@ -269,7 +275,13 @@ class FL_EXPORT Fl_Help_View : public Fl_Group { // Help viewer widget
Fl_Color get_color(const char *n, Fl_Color c);
Fl_Shared_Image *get_image(const char *name, int W, int H);
int get_length(const char *l);
+#if FLTK_ABI_VERSION >= 10303
+public:
+#endif
int handle(int);
+#if FLTK_ABI_VERSION >= 10303
+private:
+#endif
void hv_draw(const char *t, int x, int y);
char begin_selection();