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 21d1a42e53304c5d702b3d5052e8350b1081f245..f202a3b34bef8d7a5db909648528f49520e35385 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcclient.h
 // Purpose:     wxClientDC class
-// Author:      Julian Smart
+// Author:      David Webster
 // Modified by:
-// Created:     01/02/97
+// Created:     09/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma interface "dcclient.h"
-#endif
-
 #include "wx/dc.h"
 #include "wx/dynarray.h"
 
@@ -38,48 +34,72 @@ WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
 public:
     wxWindowDC();
 
+    //
     // Create a DC corresponding to the whole window
-    wxWindowDC(wxWindow *win);
+    //
+    wxWindowDC(wxWindow* pWin);
+
+protected:
+    void InitDC(void);
 
-    virtual ~wxWindowDC();
-};
+    //
+    // Override some base class virtuals
+    //
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
+
+private:
+    SIZEL                   m_PageSize;
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+}; // end of CLASS wxWindowDC
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-
 public:
     wxClientDC();
+    virtual ~wxClientDC();
 
-    // Create a DC corresponding to the client area of the window
     wxClientDC(wxWindow *win);
 
-    virtual ~wxClientDC();
-};
+protected:
+    void InitDC(void);
 
-class WXDLLEXPORT wxPaintDC : public wxWindowDC
-{
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    //
+    // 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 wxClientDC
+{
 public:
     wxPaintDC();
 
     // Create a DC corresponding for painting the window in OnPaint()
-    wxPaintDC(wxWindow *win);
+    wxPaintDC(wxWindow* pWin);
 
     virtual ~wxPaintDC();
 
+    // find the entry for this DC in the cache (keyed by the window)
+    static WXHDC FindDCInCache(wxWindow* pWin);
+
 protected:
     static wxArrayDCInfo ms_cache;
 
     // find the entry for this DC in the cache (keyed by the window)
-    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
-};
+    wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+}; // end of wxPaintDC
 
 #endif
     // _WX_DCCLIENT_H_