activating DrawRectangle optimization

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 1b021ba8e9750e282805a094fa7db8a0a0a89c63..9fb1cca4e7e4a15a703eb193bbaca33fd401fa0e 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.h
+// Name:        wx/msw/dcclient.h

 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:


@@ -16,88 +16,78 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dcclient.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/dc.h"

-#include "wx/dynarray.h"
-
-// ----------------------------------------------------------------------------
-// array types
-// ----------------------------------------------------------------------------
+#include "wx/msw/dc.h"
+#include "wx/dcclient.h"

 
 

-// this one if used by wxPaintDC only
-struct WXDLLEXPORT wxPaintDCInfo;
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+class wxPaintDCInfo;

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

-class WXDLLEXPORT wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl

 {
 public:
     // default ctor
 {
 public:
     // default ctor

-    wxWindowDC();
+    wxWindowDCImpl( wxDC *owner );

 
     // Create a DC corresponding to the whole window
 
     // Create a DC corresponding to the whole window

-    wxWindowDC(wxWindow *win);
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );
+
+    virtual void DoGetSize(int *width, int *height) const;

 
 protected:
 
 protected:

-    // intiialize the newly created DC
+    // initialize the newly created DC

     void InitDC();
 
     void InitDC();
 

-    // override some base class virtuals
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)
+    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);

 };
 
 };
 

-class WXDLLEXPORT wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl

 {
 public:
     // default ctor
 {
 public:
     // default ctor

-    wxClientDC();
+    wxClientDCImpl( wxDC *owner );

 
     // Create a DC corresponding to the client area of the window
 
     // Create a DC corresponding to the client area of the window

-    wxClientDC(wxWindow *win);
+    wxClientDCImpl( wxDC *owner, wxWindow *win );
+
+    virtual ~wxClientDCImpl();

 
 

-    virtual ~wxClientDC();
+    virtual void DoGetSize(int *width, int *height) const;

 
 protected:
     void InitDC();
 
 
 protected:
     void InitDC();
 

-    // override some base class virtuals
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)
+    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);

 };
 
 };
 

-class WXDLLEXPORT wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl

 {
 public:
 {
 public:

-    wxPaintDC();
+    wxPaintDCImpl( wxDC *owner );

 
     // Create a DC corresponding for painting the window in OnPaint()
 
     // Create a DC corresponding for painting the window in OnPaint()

-    wxPaintDC(wxWindow *win);
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 

-    virtual ~wxPaintDC();
+    virtual ~wxPaintDCImpl();

 
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);
 
 
     // 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);

 
 

-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
+    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);

 };
 
 /*
 };
 
 /*


@@ -106,16 +96,13 @@ private:
  * message. It is used in HandlePaint and need not be used by an application.
  */
 
  * message. It is used in HandlePaint and need not be used by an application.
  */
 

-class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
+class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC

 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);

-    virtual ~wxPaintDCEx();
-private:
-    int saveState;

 
     DECLARE_CLASS(wxPaintDCEx)
 
     DECLARE_CLASS(wxPaintDCEx)

-    DECLARE_NO_COPY_CLASS(wxPaintDCEx)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);

 };
 
 #endif
 };
 
 #endif