Author: manolo
Date: 2011-09-14 08:17:32 -0700 (Wed, 14 Sep 2011)
New Revision: 9035
Log:
Improved how the system-dependent global variable fl_gc is declared 
with or without declaring the FL_INTERNALS preprocessor variable.

Modified:
   branches/branch-1.3/FL/Fl_PostScript.H
   branches/branch-1.3/FL/Fl_Printer.H
   branches/branch-1.3/FL/mac.H

Modified: branches/branch-1.3/FL/Fl_PostScript.H
===================================================================
--- branches/branch-1.3/FL/Fl_PostScript.H	2011-09-13 13:03:07 UTC (rev 9034)
+++ branches/branch-1.3/FL/Fl_PostScript.H	2011-09-14 15:17:32 UTC (rev 9035)
@@ -206,7 +206,7 @@
  */
 class FL_EXPORT Fl_PostScript_File_Device : public Fl_Paged_Device {
 #ifdef __APPLE__
-  Fl_CGContextRef gc;
+  CGContextRef gc;
 #endif
 protected:
   Fl_PostScript_Graphics_Driver *driver();

Modified: branches/branch-1.3/FL/Fl_Printer.H
===================================================================
--- branches/branch-1.3/FL/Fl_Printer.H	2011-09-13 13:03:07 UTC (rev 9034)
+++ branches/branch-1.3/FL/Fl_Printer.H	2011-09-14 15:17:32 UTC (rev 9035)
@@ -54,9 +54,9 @@
   float scale_x;
   float scale_y;
   float angle; // rotation angle in radians
-  Fl_PMPrintSession  printSession;
-  Fl_PMPageFormat    pageFormat;
-  Fl_PMPrintSettings printSettings;
+  PMPrintSession  printSession;
+  PMPageFormat    pageFormat;
+  PMPrintSettings printSettings;
 #elif defined(WIN32)
   int   abortPrint;
   PRINTDLG      pd;

Modified: branches/branch-1.3/FL/mac.H
===================================================================
--- branches/branch-1.3/FL/mac.H	2011-09-13 13:03:07 UTC (rev 9034)
+++ branches/branch-1.3/FL/mac.H	2011-09-14 15:17:32 UTC (rev 9035)
@@ -24,33 +24,19 @@
 #if !defined(Fl_X_H)
 #  error "Never use <FL/mac.H> directly; include <FL/x.H> instead."
 #endif // !Fl_X_H
-#include <FL/Fl_Widget.H>
 
 typedef void* Window;	    // this is really a pointer to the subclass FLWindow of NSWindow
-typedef void* Fl_Offscreen; // this is really a CGContextRef
-typedef void* Fl_Bitmask;   // this is really a CGImageRef
 
-#include <AvailabilityMacros.h>
-#ifndef MAC_OS_X_VERSION_10_3
-#define MAC_OS_X_VERSION_10_3 1030
-#endif
-#ifndef MAC_OS_X_VERSION_10_4
-#define MAC_OS_X_VERSION_10_4 1040
-#endif
-#ifndef MAC_OS_X_VERSION_10_5
-#define MAC_OS_X_VERSION_10_5 1050
-#endif
-#ifndef MAC_OS_X_VERSION_10_6
-#define MAC_OS_X_VERSION_10_6 1060
-#endif
-
 #if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
+#  include <FL/Fl_Widget.H>
 
-typedef void* Fl_Region;
-typedef void* Fl_CGContextRef;
-typedef void* Fl_PMPrintSettings;
-typedef void* Fl_PMPageFormat;
-typedef void* Fl_PMPrintSession;
+typedef struct flCocoaRegion* Fl_Region;
+typedef struct CGContext* CGContextRef;
+typedef struct OpaquePMPrintSettings*   PMPrintSettings;
+typedef struct OpaquePMPageFormat*      PMPageFormat;
+typedef struct OpaquePMPrintSession*    PMPrintSession;
+typedef struct CGImage* CGImageRef;
+typedef CGContextRef Fl_Offscreen;
 
 #else // this part must be compiled when building the FLTK libraries
 
@@ -58,10 +44,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #undef check // because of Fl::check()
 
-typedef CGContextRef	Fl_CGContextRef;
-typedef PMPrintSettings Fl_PMPrintSettings;
-typedef PMPageFormat	Fl_PMPageFormat;
-typedef PMPrintSession	Fl_PMPrintSession;
+typedef CGContextRef Fl_Offscreen;
 
 typedef struct flCocoaRegion {
   int count;
@@ -151,27 +134,42 @@
   RGBColor rgb;
   ulong pen;
 } *fl_current_xmap;
-extern FL_EXPORT Window fl_window;
+extern Window fl_window;
 
 #endif // FL_LIBRARY || FL_INTERNALS
 
-extern FL_EXPORT Fl_CGContextRef fl_gc;
-extern FL_EXPORT class Fl_Sys_Menu_Bar *fl_sys_menu_bar;
+#ifndef MAC_OS_X_VERSION_10_3
+#define MAC_OS_X_VERSION_10_3 1030
+#endif
+#ifndef MAC_OS_X_VERSION_10_4
+#define MAC_OS_X_VERSION_10_4 1040
+#endif
+#ifndef MAC_OS_X_VERSION_10_5
+#define MAC_OS_X_VERSION_10_5 1050
+#endif
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
 
+typedef CGImageRef Fl_Bitmask;
+
+extern CGContextRef fl_gc;
+extern class Fl_Sys_Menu_Bar *fl_sys_menu_bar;
+
 extern Window fl_xid(const Fl_Window*);
 extern Fl_Window* fl_find(Window xid);
 void fl_clip_region(Fl_Region);
 
-extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
-extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
-extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm);
+extern Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
+extern Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);
+extern void fl_delete_bitmask(Fl_Bitmask bm);
 extern Fl_Offscreen fl_create_offscreen(int w, int h);
 extern void fl_copy_offscreen(int x,int y,int w,int h, Fl_Offscreen gWorld, int srcx,int srcy);
 extern void fl_delete_offscreen(Fl_Offscreen gWorld);
 extern void fl_begin_offscreen(Fl_Offscreen gWorld);
 extern void fl_end_offscreen();
 
-extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
+extern int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b);
 extern void fl_open_display();
 
 #endif // FL_DOXYGEN