use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 85191f6e45ae4c107043508dfe8215d579ce405b..10ca985c09b3618d6436a82fa802b2593b1b00c7 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -12,20 +12,33 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/os2/dc.h"

 
 

-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC* pDC); // Create compatible DC

 
 

-  public:
-    wxMemoryDC(void);
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    // override some base class virtuals
+    virtual void DoGetSize(int* pWidth, int* pHeight) const;
+    virtual void DoSelect(const wxBitmap& bitmap);

 
 

-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    virtual void DoGetSize( int *width, int *height ) const;
-};
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
+
+protected:
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC* pDC);
+
+    // initialize the newly created DC
+    void Init(void);
+private:
+    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+}; // end of CLASS wxMemoryDCImpl

 
 #endif
     // _WX_DCMEMORY_H_
 
 #endif
     // _WX_DCMEMORY_H_