wxDirDialog now has the same ctor under all platforms and also uses the

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 16949da89b9f4d1cb5970ee624cd1e58403c6160..ccf5927bf2e01091cf926c57d87997c5ada4b675 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -30,11 +30,7 @@
 // this one if used by wxPaintDC only
 struct WXDLLEXPORT wxPaintDCInfo;
 
 // this one if used by wxPaintDC only
 struct WXDLLEXPORT wxPaintDCInfo;
 

-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

 
 // ----------------------------------------------------------------------------
 // DC classes
 
 // ----------------------------------------------------------------------------
 // DC classes


@@ -42,34 +38,47 @@ WX_DECLARE_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();
+
+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+
+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();
+
+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)

 };
 
 };
 

-class WXDLLEXPORT wxPaintDC : public wxWindowDC
+class WXDLLEXPORT wxPaintDC : public wxClientDC

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
     wxPaintDC();
 
 public:
     wxPaintDC();
 


@@ -78,11 +87,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