Begin to remove platform-dependent code from the Fl.H header file.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11482 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 7 insertions, 9 deletions

diff --git a/FL/Fl.H b/FL/Fl.H
index 04dea16be..ba1af48ed 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -207,17 +207,8 @@ public: // should be private!
   static Fl_Window* grab_;
   static int compose_state; // used for dead keys (WIN32) or marked text (MacOS)
   static void call_screen_init(); // recompute screen number and dimensions
-#ifdef __APPLE__ // PORTME: add for all platforms - additional functions
   static void reset_marked_text(); // resets marked text
   static void insertion_point_location(int x, int y, int height); // sets window coordinates & height of insertion point
-#elif defined(WIN32)
-  // not needed in WIN32
-#elif defined(FL_PORTING)
-# pragma message "FL_PORTING: add these functions to all platforms?"
-  // no default implementation
-#else
-  // not needed in X11
-#endif
 #endif // FL_DOXYGEN
   
   
diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H
index 5599b2a83..902e8bc70 100644
--- a/FL/Fl_System_Driver.H
+++ b/FL/Fl_System_Driver.H
@@ -120,6 +120,13 @@ public:
   virtual unsigned utf8from_mb(char* dst, unsigned dstlen, const char* src, unsigned srclen);
   // implement to shield fprintf() from locale changes in decimal point
   virtual int clocale_printf(FILE *output, const char *format, va_list args);
+  /* Implement to indicate whether complex text input may involve marked text.
+   When it does, has_marked_text returns non zero and reset_marked_text() and
+   insertion_point_location() must also be implemented.
+  */
+  virtual int has_marked_text() { return 0; }
+  virtual void reset_marked_text() {}
+  virtual void insertion_point_location(int x, int y, int height) {}
 };
 
 #endif // FL_SYSTEM_DRIVER_H