X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..659ca93c425faabda30fce9dee68b38cb6868d14:/include/wx/msw/dcclient.h?ds=sidebyside

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index b57b5edbad..9fb1cca4e7 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -19,16 +19,8 @@
 #include "wx/dc.h"
 #include "wx/msw/dc.h"
 #include "wx/dcclient.h"
-#include "wx/dynarray.h"
 
-// ----------------------------------------------------------------------------
-// array types
-// ----------------------------------------------------------------------------
-
-// this one if used by wxPaintDC only
-struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+class wxPaintDCInfo;
 
 // ----------------------------------------------------------------------------
 // DC classes
@@ -86,11 +78,13 @@ public:
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);
 
-protected:
-    static wxArrayDCInfo ms_cache;
+    // This must be called by the code handling WM_PAINT to remove the DC
+    // cached for this window for the duration of this message processing.
+    static void EndPaint(wxWindow *win);
 
-    // find the entry for this DC in the cache (keyed by the window)
-    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
+protected:
+    // Find the DC for this window in the cache, return NULL if not found.
+    static wxPaintDCInfo *FindInCache(wxWindow* win);
 
     DECLARE_CLASS(wxPaintDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);