avoid a bug in Carbon headers

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 85191f6e45ae4c107043508dfe8215d579ce405b..f0484a8dee95985f883e9457ac10e860016741ba 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -16,16 +16,24 @@
 
 class WXDLLEXPORT wxMemoryDC: public wxDC
 {
 
 class WXDLLEXPORT wxMemoryDC: public wxDC
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
+public:

     wxMemoryDC(void);
     wxMemoryDC(void);

-    wxMemoryDC( wxDC *dc ); // Create compatible DC
+    wxMemoryDC(wxDC* pDC); // Create compatible DC
+
+    virtual void SelectObject(const wxBitmap& rBitmap);
+protected:
+    // override some base class virtuals
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC* pDC);

 
 

-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    virtual void DoGetSize( int *width, int *height ) const;
-};
+    // initialize the newly created DC
+    void Init(void);
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+}; // end of CLASS wxMemoryDC

 
 #endif
     // _WX_DCMEMORY_H_
 
 #endif
     // _WX_DCMEMORY_H_