Transform Fl_X::make(Fl_Window*) for Mac platform into Fl_X *Fl_Cocoa_Window_Driver::makeWindow()

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

2 files changed, 4 insertions, 11 deletions

diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index 67fc2dfb3..08b396821 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -74,6 +74,7 @@ public:
   int shown() const { return pWindow->shown(); }
   /** returns the parent of the window. */
   Fl_Group *parent() const { return pWindow->parent(); }
+  char show_iconic() { return pWindow->show_iconic_; }
 
   // --- accessors to private window data
   int minw();
@@ -93,6 +94,8 @@ public:
   void x(int X);
   void y(int Y);
   void current(Fl_Window *c);
+  void show_iconic(char c) { pWindow->show_iconic_ = c; }
+  void i(Fl_X *x) { pWindow->i = x; }
   /** for an Fl_Overlay_Window, returns the value of its overlay_ member variable */
   Fl_Window *overlay() {
     return pWindow->as_overlay_window() ? pWindow->as_overlay_window()->overlay_ : NULL;
diff --git a/FL/mac.H b/FL/mac.H
index 7deaf0df8..9c4ce11a8 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -35,16 +35,7 @@ typedef class FLWindow *Window; // pointer to the FLWindow objective-c class
 #include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Widget.H> // for Fl_Callback
 
-#if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
-
-typedef struct CGContext* CGContextRef;
-typedef struct OpaquePMPrintSettings*   PMPrintSettings;
-typedef struct OpaquePMPageFormat*      PMPageFormat;
-typedef struct OpaquePMPrintSession*    PMPrintSession;
-typedef struct CGImage* CGImageRef;
-typedef struct __CFData* CFMutableDataRef; // used in Fl_Copy_Surface.H
-
-#else // this part must be compiled when building the FLTK libraries
+#if (defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part must be compiled when building the FLTK libraries
 
 // Standard MacOS C/C++ includes...
 #include <ApplicationServices/ApplicationServices.h>
@@ -122,7 +113,6 @@ public:
   Fl_X *next;              // chain of mapped windows
   static Fl_X* first;
   static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
-  static void make(Fl_Window*);
   // Cocoa additions
   static NSOpenGLPixelFormat *mode_to_NSOpenGLPixelFormat(int mode, const int*); // computes NSOpenGLPixelFormat from Gl window's mode
   static NSOpenGLContext* create_GLcontext_for_window(NSOpenGLPixelFormat *pixelformat, NSOpenGLContext *shared_ctx, Fl_Window *window);