Adopted OS/2 to DC reorganisation (r50348).

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

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index fc18c8f8ae351b982c8b061a3e6e94431d68e0f1..b99eedcd11a2344c9899b198359332a486ea25d3 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -17,6 +17,8 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/dc.h"
+#include "wx/os2/dc.h"
+#include "wx/dcclient.h"
 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
@@ -26,68 +28,63 @@
 // this one if used by wxPaintDC only
 struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
 
-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 // ----------------------------------------------------------------------------
 // DC classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowDC : public wxDC
+class WXDLLEXPORT wxWindowDCImpl : public wxPMDCImpl
 {
 public:
-    wxWindowDC();
+    // default ctor
+    wxWindowDCImpl( wxDC *owner );
 
-    //
     // Create a DC corresponding to the whole window
-    //
-    wxWindowDC(wxWindow* pWin);
+    wxWindowDCImpl( wxDC *owner, wxWindow *pWin );
+
+    virtual void DoGetSize(int *pWidth, int *pHeight) const;
 
 protected:
+    // initialize the newly created DC
     void InitDC(void);
 
-    //
-    // Override some base class virtuals
-    //
-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-
 private:
     SIZEL                   m_PageSize;
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_CLASS(wxWindowDCImpl)
+    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
 }; // end of CLASS wxWindowDC
 
-class WXDLLEXPORT wxClientDC : public wxWindowDC
+class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl
 {
 public:
-    wxClientDC();
-    virtual ~wxClientDC();
+    // default ctor
+    wxClientDCImpl( wxDC *owner );
+
+    // Create a DC corresponding to the client area of the window
+    wxClientDCImpl( wxDC *owner, wxWindow *pWin );
 
-    wxClientDC(wxWindow *win);
+    virtual ~wxClientDCImpl();
+
+    virtual void DoGetSize(int *pWidth, int *pHeight) const;
 
 protected:
     void InitDC(void);
 
-    //
-    // Override some base class virtuals
-    //
-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-
 private:
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_CLASS(wxClientDCImpl)
+    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
 }; // end of CLASS wxClientDC
 
-class WXDLLEXPORT wxPaintDC : public wxClientDC
+class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl
 {
 public:
-    wxPaintDC();
+    wxPaintDCImpl( wxDC *owner );
 
     // Create a DC corresponding for painting the window in OnPaint()
-    wxPaintDC(wxWindow* pWin);
+    wxPaintDCImpl( wxDC *owner, wxWindow *pWin );
 
-    virtual ~wxPaintDC();
+    virtual ~wxPaintDCImpl();
 
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* pWin);
@@ -98,7 +95,8 @@ protected:
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
 private:
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_CLASS(wxPaintDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
 }; // end of wxPaintDC
 
 #endif