Move struct shape_data_type inside Fl_XXX_Window_Driver.

2 files changed, 8 insertions, 5 deletions

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
index f0d31ec1c..f5c9d8f7f 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
@@ -65,11 +65,6 @@ class NSOpenGLPixelFormat;
 
  ? where do we handle the interface between OpenGL/DirectX and Cocoa/Windows/Glx?
  */
-struct Fl_Window_Driver::shape_data_type {
-  Fl_Image* shape_; ///<  shape image
-  typedef struct CGImage* CGImageRef;
-  CGImageRef mask;
-};
 
 /**
  \}
@@ -80,6 +75,11 @@ struct Fl_Window_Driver::shape_data_type {
 class FL_EXPORT Fl_Cocoa_Window_Driver : public Fl_Window_Driver
 {
 private:
+  struct shape_data_type {
+    Fl_Image* shape_; ///<  shape image
+    typedef struct CGImage* CGImageRef;
+    CGImageRef mask;
+  } *shape_data_;
   void shape_bitmap_(Fl_Image* b);
   void shape_alpha_(Fl_Image* img, int offset);
   CGRect* subRect_;           // makes sure subwindow remains inside its parent window
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index e91342c8a..b7f213da0 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -35,6 +35,7 @@ Fl_Cocoa_Window_Driver::Fl_Cocoa_Window_Driver(Fl_Window *win)
   window_flags_ = 0;
   icon_image = NULL;
   screen_num_ = 0;
+  shape_data_ = NULL;
 }
 
 
@@ -88,6 +89,8 @@ void Fl_Cocoa_Window_Driver::draw_begin()
       CGContextClipToMask(my_gc, CGRectMake(0,0,w(),h()), shape_data_->mask); // requires Mac OS 10.4
     }
     CGContextSaveGState(my_gc);
+   CGAffineTransform mat = CGContextGetCTM(my_gc);
+    printf("mat.a=%g\n",mat.a);
 # endif
   }
 }