applied patch 446014 (misc mingw fixes from Mattia)

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 06288fba28282cdad1bfd8466a3ad8c65ec0bf63..0c2cca05858a4d1aaca46b02379735e1e9c4d0a6 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -29,7 +29,8 @@
 
 // this one if used by wxPaintDC only
 struct WXDLLEXPORT wxPaintDCInfo;
-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 // ----------------------------------------------------------------------------
 // DC classes
@@ -37,34 +38,41 @@ WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
 public:
+    // default ctor
     wxWindowDC();
 
     // Create a DC corresponding to the whole window
     wxWindowDC(wxWindow *win);
 
-    virtual ~wxWindowDC();
+protected:
+    // intiialize the newly created DC
+    void InitDC();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)
 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-
 public:
+    // default ctor
     wxClientDC();
 
     // Create a DC corresponding to the client area of the window
     wxClientDC(wxWindow *win);
 
     virtual ~wxClientDC();
+
+protected:
+    void InitDC();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
-class WXDLLEXPORT wxPaintDC : public wxWindowDC
+class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
 public:
     wxPaintDC();
 
@@ -73,11 +81,17 @@ public:
 
     virtual ~wxPaintDC();
 
+    // find the entry for this DC in the cache (keyed by the window)
+    static WXHDC FindDCInCache(wxWindow* win);
+
 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;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
 };
 
 #endif