From a8530c73fa2e7a53f0fcef9f391ce3ea6cbd6c4a Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 23 Dec 2010 14:24:29 +0000
Subject: Adopted use of FL_LIBRARY #define symbol under Mac OS X. This allows
 to compile client applications without including Mac OS system headers, with
 a gain in speed of compilation and portability. The source files of all FLTK
 libraries must now be compiled with -DFL_LIBRARY under Mac OS X. Make, CMake
 and Xcode project support files have been modified accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/CMakeLists.txt | 1 +
 src/Fl.cxx         | 2 +-
 src/Fl_cocoa.mm    | 5 +++++
 src/Makefile       | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b35ac57a..b613766a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -194,6 +194,7 @@ set(CFILES
 )
 
 if(APPLE)
+    add_definitions(-DFL_LIBRARY)
 	set(MMFILES
 		Fl_cocoa.mm
 		Fl_Quartz_Printer.mm
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 53d758f1d..6e0780f66 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -667,7 +667,7 @@ Fl_Window* Fl::next_window(const Fl_Window* window) {
 */
 void Fl::first_window(Fl_Window* window) {
   if (!window || !window->shown()) return;
-  fl_find(fl_xid(window));
+  fl_find( Fl_X::i(window)->xid );
 }
 
 /**
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index cd191a5a0..2ad315037 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3266,6 +3266,11 @@ CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h) {
   return CGRectMake(x, y, w > 0 ? w - 0.9 : 0, h > 0 ? h - 0.9 : 0);
 }
 
+Window fl_xid(const Fl_Window* w)
+{
+  return Fl_X::i(w)->xid;
+}
+
 #endif // __APPLE__
 
 //
diff --git a/src/Makefile b/src/Makefile
index ff26b0315..dc56621d7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -217,7 +217,7 @@ UTF8CFILES = \
 	xutf8/utf8Wrap.c
 
 ################################################################
-
+FLTKFLAGS = -DFL_LIBRARY
 include ../makeinclude
 
 MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi)
-- 
cgit v1.2.3