From e444371b1831fc4f84ef554902a07f8d52b3573f Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 15 Jul 2025 07:21:44 +0200 Subject: Fix: Redundant redeclaration of Fl_Shortcut fl_old_shortcut(const char*) (#1277) --- FL/Fl_Button.H | 4 +--- src/Fl_Button.cxx | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FL/Fl_Button.H b/FL/Fl_Button.H index 995338545..a6429bbac 100644 --- a/FL/Fl_Button.H +++ b/FL/Fl_Button.H @@ -33,7 +33,6 @@ are set to zero.*/ #define FL_HIDDEN_BUTTON 3 ///< for Forms compatibility -extern FL_EXPORT Fl_Shortcut fl_old_shortcut(const char*); class Fl_Widget_Tracker; @@ -160,8 +159,7 @@ public: */ void down_box(Fl_Boxtype b) {down_box_ = b;} - /// (for backwards compatibility) - void shortcut(const char *s) {shortcut(fl_old_shortcut(s));} + void shortcut(const char *s); /// (for backwards compatibility) Fl_Color down_color() const {return selection_color();} diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index fb70114d6..e586e5ffa 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -329,3 +329,6 @@ Fl_Toggle_Button::Fl_Toggle_Button(int X,int Y,int W,int H,const char *L) \param[in] v switch compact mode on (1) or off (0) */ void Fl_Button::compact(uchar v) { compact_ = v; } + +/// (for backwards compatibility) +void Fl_Button::shortcut(const char *s) {shortcut(fl_old_shortcut(s));} -- cgit v1.2.3