forward port from 2.8

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/dc.h

@@ -199,6 +199,9 @@ public:
     virtual void StartPage() { }
     virtual void EndPage() { }
 
+    // flushing the content of this dc immediately eg onto screen
+    virtual void Flush() { }
+
     // bounding box
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y)

include/wx/dcgraph.h

@@ -50,11 +50,14 @@ public:
 
     virtual void Clear();
 
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
+    virtual bool StartDoc( const wxString& message );
-    virtual void EndDoc(void) {}
+    virtual void EndDoc();
 
-    virtual void StartPage(void) {}
+    virtual void StartPage();
-    virtual void EndPage(void) {}
+    virtual void EndPage();
+    
+    // flushing the content of this dc immediately onto screen
+    virtual void Flush();
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);

include/wx/defs.h

@@ -2552,7 +2552,7 @@ typedef void*       WXDisplay;
 
 #endif
 
-#ifdef __WXCOCOA__
+#if defined( __WXCOCOA__ ) || ( defined(__WXMAC__) && defined(__DARWIN__) )
 
 /* Definitions of 32-bit/64-bit types
  * These are typedef'd exactly the same way in newer OS X headers so
@@ -2647,8 +2647,14 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
+#ifdef __WXMAC__
+// things added for __WXMAC__
+DECLARE_WXCOCOA_OBJC_CLASS(NSString);
+#else
+// things only for __WXCOCOA__
 typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
-#endif /*  __WXCOCOA__ */
+#endif
+#endif /*  __WXCOCOA__  || ( __WXMAC__ &__DARWIN__)*/
 
 #if defined(__WXPALMOS__)
 

include/wx/graphics.h

@@ -409,6 +409,22 @@ public:
     // create a context that can be used for measuring texts only, no drawing allowed
     static wxGraphicsContext * Create();
 
+    // begin a new document (relevant only for printing / pdf etc) if there is a progress dialog, message will be shown
+    virtual bool StartDoc( const wxString& message ) ;
+    
+    // done with that document (relevant only for printing / pdf etc) 
+    virtual void EndDoc();
+
+    // opens a new page  (relevant only for printing / pdf etc) with the given size in points 
+    // (if both are null the default page size will be used)
+    virtual void StartPage( wxDouble width = 0, wxDouble height = 0 );
+    
+    // ends the current page  (relevant only for printing / pdf etc) 
+    virtual void EndPage();
+    
+    // make sure that the current content of this context is immediately visible
+    virtual void Flush();
+
     wxGraphicsPath CreatePath() const;
     
     virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
@@ -437,10 +453,10 @@ public:
     // pops a stored state from the stack
     virtual void PopState() = 0;
 
-    // clips drawings to the region, combined to current clipping region
+    // clips drawings to the region intersected with the current clipping region
     virtual void Clip( const wxRegion &region ) = 0;
 
-    // clips drawings to the rect
+    // clips drawings to the rect intersected with the current clipping region
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
     
     // resets the clipping to original extent
@@ -455,6 +471,19 @@ public:
     // sets the current logical function, returns true if it supported
     virtual bool SetLogicalFunction(int function) ;
 
+    // returns the size of the graphics context in device coordinates
+    virtual void GetSize( wxDouble* width, wxDouble* height);
+
+    // returns the resolution of the graphics context in device points per inch
+    virtual void GetDPI( wxDouble* dpiX, wxDouble* dpiY);
+    
+#if 0
+    // sets the current alpha on this context
+    virtual void SetAlpha( wxDouble alpha );
+    
+    // returns the alpha on this context
+    virtual wxDouble GetAlpha() const;
+#endif
     //
     // transformation : changes the current transformation matrix CTM of the context
     //