Add wxDataViewTextRendererAttr, blind noop under wxMac

[wxWidgets.git] / include / wx / msw / dcmemory.h

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 19ad43e38442507be632bb79d6081b02ba57fc36..fd2c032c7d98b139dafa146988056f6c696a7c13 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -12,24 +12,24 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxMemoryDC : public wxDC
+class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase

 {
 public:
 {
 public:

-    wxMemoryDC();
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }

     wxMemoryDC(wxDC *dc); // Create compatible DC
 
     wxMemoryDC(wxDC *dc); // Create compatible DC
 

-    virtual void SelectObject(const wxBitmap& bitmap);

 
 protected:
     // override some base class virtuals
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSize(int* width, int* height) const;
 
 protected:
     // override some base class virtuals
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSize(int* width, int* height) const;

+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}

 
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);
 
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);