diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-06-27 14:55:40 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-06-27 14:55:40 +0200 |
| commit | c2185f31b95af4feb6522ee821362acbb01bd374 (patch) | |
| tree | 1369872b691bce88b4aead16c8a022bc37c600ba | |
| parent | 2a5c2322f195b0db1fbe2e67df3d91ff77ace6fe (diff) | |
Remove unused code controlled by the FLTK_CONSOLIDATE_MOTION preprocessor variable.
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ba58b9d17..bb1d570e7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -24,8 +24,8 @@ Changes in FLTK 1.4.0 Released: ??? ?? 2022 - X11 platform: class Fl_Native_File_Chooser will run the KDE file dialog rather than the GTK dialog if the current desktop is KDE and if command "kdialog" is available on the running platform (issue #278). - - The undocumented feature FLTK_CONSOLIDATE_MOTION is now OFF on X11 like - on macOS. In FLTK 1.3 this feature has been ON on X11. The macro can now + - The undocumented feature FLTK_CONSOLIDATE_MOTION is now OFF on X11 and + removed on macOS. In FLTK 1.3 this feature has been ON on X11. The macro can now be set on the compiler commandline and can be used to reduce the number of mouse move events sent to the application but it may be unreliable. Recommendation: let it switched OFF unless you really need it. diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 889b5c37b..05a748b8e 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -14,10 +14,6 @@ // https://www.fltk.org/bugs.php // -#ifndef FLTK_CONSOLIDATE_MOTION -#define FLTK_CONSOLIDATE_MOTION 0 -#endif - extern "C" { #include <pthread.h> } @@ -111,11 +107,6 @@ static NSMutableArray *dropped_files_list = nil; // list of files dropped at app typedef void (*open_cb_f_type)(const char *); static Fl_Window *starting_moved_window = NULL; // the moved window which brings its subwins with it -#if FLTK_CONSOLIDATE_MOTION -static Fl_Window* send_motion; -extern Fl_Window* fl_xmousewin; -#endif - enum { FLTKTimerEvent = 1, FLTKDataReadyEvent }; // Carbon functions and definitions @@ -779,12 +770,6 @@ static int do_queued_events( double time = 0.0 ) } fl_lock_function(); -#if FLTK_CONSOLIDATE_MOTION - if (send_motion && send_motion == fl_xmousewin) { - send_motion = 0; - Fl::handle(FL_MOVE, fl_xmousewin); - } -#endif return got_events; } |