From ab5252071c37b32397565a5d846de17984b75c3a Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 2 Apr 2016 09:34:17 +0000
Subject: Move Fl_X::next_marked_length to the Fl_Cocoa_Screen_Driver class.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11503 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H   | 1 +
 src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
index 34bf6b6ce..a1f278a63 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -54,6 +54,7 @@ protected:
   static bool insertion_point_location_is_valid;
 public:
   Fl_Cocoa_Screen_Driver();
+  static int next_marked_length; // next length of marked text after current marked text will have been replaced
   // --- display management
   // --- screen configuration
   virtual void init();
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index a048bb4b2..1f68fd8d8 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -31,7 +31,7 @@ extern "C" void NSBeep(void);
 extern double fl_mac_flush_and_wait(double time_to_wait);
 extern int fl_ready();
 
-int Fl_X::next_marked_length = 0;
+int Fl_Cocoa_Screen_Driver::next_marked_length = 0;
 
 /**
  Creates a driver that manages all screen and display related calls.
@@ -266,7 +266,7 @@ bool Fl_Cocoa_Screen_Driver::insertion_point_location_is_valid = false;
 
 void Fl_Cocoa_Screen_Driver::reset_marked_text() {
   Fl::compose_state = 0;
-  Fl_X::next_marked_length = 0;
+  next_marked_length = 0;
   insertion_point_location_is_valid = false;
 }
 
@@ -297,7 +297,7 @@ int Fl_Cocoa_Screen_Driver::compose(int &del) {
   !has_text_key ;
   if (condition) { del = 0; return 0;} // this stuff is to be treated as a function key
   del = Fl::compose_state;
-  Fl::compose_state = Fl_X::next_marked_length;
+  Fl::compose_state = next_marked_length;
   return 1;
 }
 
-- 
cgit v1.2.3