1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx
index d712a7d8f..30231be5c 100644
--- a/src/Fl_Input.cxx
+++ b/src/Fl_Input.cxx
@@ -359,8 +359,8 @@ int Fl_Input::handle_key() {
 	           Fl::event_text(), Fl::event_length());
     }
 #ifdef __APPLE__
-    if (Fl::marked_text_length()) {
-      this->mark( this->position() - Fl::marked_text_length() );
+    if (Fl::compose_state) {
+      this->mark( this->position() - Fl::compose_state );
       }
 #endif
     return 1;
@@ -592,7 +592,7 @@ int Fl_Input::handle(int event) {
   switch (event) {
 #ifdef __APPLE__
     case FL_UNFOCUS:
-      if (Fl::marked_text_length()) {
+      if (Fl::compose_state) {
 	this->mark( this->position() );
 	Fl::reset_marked_text();
       }
@@ -818,7 +818,7 @@ Fl_Secret_Input::Fl_Secret_Input(int X,int Y,int W,int H,const char *l)
 int Fl_Secret_Input::handle(int event) {
   int retval = Fl_Input::handle(event);
 #ifdef __APPLE__
-  if (event == FL_KEYBOARD && Fl::marked_text_length()) {
+  if (event == FL_KEYBOARD && Fl::compose_state) {
     this->mark( this->position() ); // don't underline marked text
   }
 #endif