avoid a bug in Carbon headers

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

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index f0d686183086f6afbab2078e81b15366f784f1ff..f202a3b34bef8d7a5db909648528f49520e35385 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     09/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
@@ -37,12 +37,21 @@ class WXDLLEXPORT wxWindowDC : public wxDC
 public:
     wxWindowDC();
 
+    //
     // Create a DC corresponding to the whole window
+    //
     wxWindowDC(wxWindow* pWin);
 
 protected:
     void InitDC(void);
 
+    //
+    // Override some base class virtuals
+    //
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
+
 private:
     SIZEL                   m_PageSize;
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
@@ -52,15 +61,25 @@ class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:
     wxClientDC();
+    virtual ~wxClientDC();
 
-    // Create a DC corresponding to the client area of the window
     wxClientDC(wxWindow *win);
 
+protected:
+    void InitDC(void);
+
+    //
+    // Override some base class virtuals
+    //
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 }; // end of CLASS wxClientDC
 
-class WXDLLEXPORT wxPaintDC : public wxWindowDC
+class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
     wxPaintDC();