X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83626bfa72bd7f0147392818846242a846d12063..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/msw/dcclient.h

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 9851d78d77..21d1a42e53 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -6,60 +6,80 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DCCLIENTH__
-#define __DCCLIENTH__
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma interface "dcclient.h"
+    #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
+#include "wx/dynarray.h"
+
+// ----------------------------------------------------------------------------
+// array types
+// ----------------------------------------------------------------------------
+
+// this one if used by wxPaintDC only
+struct WXDLLEXPORT wxPaintDCInfo;
 
-class WXDLLEXPORT wxClientDC: public wxDC
+WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+
+// ----------------------------------------------------------------------------
+// DC classes
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindowDC : public wxDC
 {
-  DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
- public:
-  wxClientDC(void);
+public:
+    wxWindowDC();
 
-  // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
+    // Create a DC corresponding to the whole window
+    wxWindowDC(wxWindow *win);
 
-  ~wxClientDC(void);
+    virtual ~wxWindowDC();
 };
 
-class WXDLLEXPORT wxWindowDC: public wxDC
+class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS(wxClientDC)
 
- public:
-  wxWindowDC(void);
+public:
+    wxClientDC();
 
-  // Create a DC corresponding to a canvas
-  wxWindowDC(wxWindow *win);
+    // Create a DC corresponding to the client area of the window
+    wxClientDC(wxWindow *win);
 
-  ~wxWindowDC(void);
+    virtual ~wxClientDC();
 };
 
-class WXDLLEXPORT wxPaintDC: public wxDC
+class WXDLLEXPORT wxPaintDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+
+public:
+    wxPaintDC();
 
- public:
-  wxPaintDC(void);
+    // Create a DC corresponding for painting the window in OnPaint()
+    wxPaintDC(wxWindow *win);
 
-  // Create a DC corresponding to a canvas
-  wxPaintDC(wxWindow *win);
+    virtual ~wxPaintDC();
 
-  ~wxPaintDC(void);
+protected:
+    static wxArrayDCInfo ms_cache;
 
- protected:
-    static WXHDC ms_PaintHDC;
-    static uint  ms_PaintCount;
+    // find the entry for this DC in the cache (keyed by the window)
+    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 };
 
 #endif
-    // __DCCLIENTH__
+    // _WX_DCCLIENT_H_