Compile in IFF stuff.

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 997f2cfc6e41dd8bdd01378733716f1b4bc5d1f7..0c2cca05858a4d1aaca46b02379735e1e9c4d0a6 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -38,34 +38,41 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
 
 class WXDLLEXPORT wxWindowDC : public wxDC
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
 public:

+    // default ctor

     wxWindowDC();
 
     // Create a DC corresponding to the whole window
     wxWindowDC(wxWindow *win);
 
     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
 {
 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
 public:

+    // default ctor

     wxClientDC();
 
     // Create a DC corresponding to the client area of the window
     wxClientDC(wxWindow *win);
 
     virtual ~wxClientDC();
     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();
 
 public:
     wxPaintDC();
 


@@ -74,11 +81,17 @@ public:
 
     virtual ~wxPaintDC();
 
 
     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;
 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
 };
 
 #endif