summaryrefslogtreecommitdiff
path: root/src/drivers/Cocoa
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2021-06-18 18:46:17 +0200
committerAlbrecht Schlosser <albrechts.fltk@online.de>2021-06-18 18:46:17 +0200
commit713d1bfd7c4a538b7bd3625a5f521f5911a9f500 (patch)
tree154054ca49f2801a85186f08ec4b6704b190a3da /src/drivers/Cocoa
parentf94ed7116c2943c105faebb14798e2ac33bb37cd (diff)
Revert parts of and fix other 'constness' changes (#239, #181)
Some of the previous constness changes turned out to be incomplete, others had to be reverted because some other driver methods could not be made 'const' - particularly those calling open_display() to get the requested information.
Diffstat (limited to 'src/drivers/Cocoa')
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H2
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
index 4ea00677d..9c20b3b9b 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -85,7 +85,7 @@ public:
virtual void repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp);
virtual int has_timeout(Fl_Timeout_Handler cb, void *argp);
virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp);
- virtual int has_marked_text();
+ virtual int has_marked_text() const;
virtual void reset_marked_text();
virtual void insertion_point_location(int x, int y, int height);
int insertion_point_location(int *px, int *py, int *pheight);
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 651da1f1d..1838a73f3 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -210,8 +210,8 @@ void Fl_Cocoa_Screen_Driver::get_system_colors()
}
-int Fl_Cocoa_Screen_Driver::has_marked_text() {
- return true;
+int Fl_Cocoa_Screen_Driver::has_marked_text() const {
+ return 1;
}