Made wxCairo graphics code compile again, wxGraphicsBitmap still missing

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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index f26ae667f1cb7238e0f33babdf4fac0ad85f5c5d..488e8dcd5453f64d04d0c0e3efd397889d38e81b 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -439,7 +439,9 @@ public:
     // image support
     //
 
     // image support
     //
 

+#ifndef __WXGTK20__

     virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
     virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;

+#endif

 
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
 
 
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
 


@@ -577,12 +579,16 @@ public :
 
    // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0;
 
    // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0;

-    
+
+#ifndef __WXGTK20__    

     // create a native bitmap representation
     virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0;
     
     // create a subimage from a native image representation
     virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) = 0;
     // create a native bitmap representation
     virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0;
     
     // create a subimage from a native image representation
     virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) = 0;

+#endif
+
+

 private :
     DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
     DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
 private :
     DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
     DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)

diff --git a/interface/graphics.h b/interface/graphics.h
index c20139b4bd3c975b48596de8bc479ca4988e291c..5d973ec52b1d726b0b224554ae6b4285203b8768 100644 (file)
--- a/interface/graphics.h
+++ b/interface/graphics.h
@@ -196,6 +196,29 @@ public:
     instance, or indirectly using the static convenience CreateXXX functions of
     wxGraphicsContext that always delegate the task to the default renderer.
 
     instance, or indirectly using the static convenience CreateXXX functions of
     wxGraphicsContext that always delegate the task to the default renderer.
 

+    @code
+    void MyCanvas::OnPaint(wxPaintEvent &event)
+    {
+        // Create paint DC
+        wxPaintDC dc(this);
+        
+        // Create graphics context from it
+        wxGraphicsContext *gc = dc.CreateGraphicsContext();
+    
+        // make a path that contains a circle and some lines, centered at 100,100
+        wxGraphicsPath path = gc->CreatePath();
+        path.AddCircle( 0.0, 0.0, 100.0 );
+        path.MoveToPoint(0.0, -100.0);
+        path.AddLineToPoint(0.0, 100.0);
+        path.MoveToPoint(-100.0, 0.0);
+        path.AddLineToPoint(100.0, 0);
+        path.CloseSubpath();
+        path.AddRectangle(-50.0, -25.0, 100.0, 50.0);
+        
+        delete gc;
+    @endcode
+
+

     @library{wxcore}
     @category{FIXME}
 
     @library{wxcore}
     @category{FIXME}
 

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index b70fbd4f9a4c4727d4621c22bc7f8ce8da0888a8..0c6ff555903508461c10459cf1dc1b8899fd4c8c 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -1516,6 +1516,20 @@ public :
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
 
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
 

+    // create a native bitmap representation
+#if 0
+    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap )
+    {
+      return wxGraphicsBitmap;
+    }
+    
+    // create a subimage from a native image representation
+    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  )
+    {
+      return wxGraphicsBitmap;
+    }
+#endif
+

 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;
 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;