Implement wxDataViewTreeStore::DeleteAllItems().

[wxWidgets.git] / include / wx / graphics.h

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 4d94b753003a515f8ac7958bee1b1852e6efb306..d93d63ba413d8350061c7909af9a33ab2f795c63 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -417,7 +417,7 @@ public:
     // all rendering is done into a fully transparent temporary context
     virtual void BeginLayer(wxDouble opacity) = 0;
 
     // all rendering is done into a fully transparent temporary context
     virtual void BeginLayer(wxDouble opacity) = 0;
 

-    // composites back the drawings into the content with the opacity given at 
+    // composites back the drawings into the context with the opacity given at 

     // the BeginLayer call
     virtual void EndLayer() = 0;
 
     // the BeginLayer call
     virtual void EndLayer() = 0;
 


@@ -499,9 +499,7 @@ 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;
 


@@ -657,14 +655,11 @@ 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:
     wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer);
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer);