Mac OS X: removed all uses of Carbon (except for older OS versions) and re-organized

text input around the NSTextInput protocol.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/FL/mac.H b/FL/mac.H
index d85b63bc1..2c945a953 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -49,8 +49,8 @@ typedef void* Fl_PMPrintSession;
 
 #else // this part must be compiled when building the FLTK libraries
 
-// Standard MacOS Carbon API includes...
-#include <Carbon/Carbon.h>
+// Standard MacOS C/C++ includes...
+#include <ApplicationServices/ApplicationServices.h>
 #undef check // because of Fl::check()
 
 typedef CGContextRef	Fl_CGContextRef;
@@ -154,6 +154,7 @@ public:
   static CGContextRef nesw_cursor_image(void);
   static CGContextRef nwse_cursor_image(void);
   static CGContextRef none_cursor_image(void);
+  static void *get_carbon_function(const char *name);
 private:
   static void relink(Fl_Window*, Fl_Window*);
 };