Made widgets sample take up less space

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

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index e7219e22c1b7a8fd2223456664bc9d6d9e6640ac..9d23d693b19b11ee0d17e29cc3446f327a933b1d 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -34,54 +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);
 
-    virtual ~wxWindowDC();
+protected:
+    void InitDC(void);
+
+    //
+    // Override some base class virtuals
+    //
+    virtual void DoGetSize( int* pWidth
+                           ,int* pHeight
+                          ) const;
 
-    // PM specific stuff
-    HPS                     m_hPS;
 private:
-    HAB                     m_hab;
     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_