no changes, just remove #if'd out code

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 05743e7ec3b58722c20397416d6c17694d0a50f6..166ace2792f875772ad6238a4deffc43b35be704 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -5,61 +5,111 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCCLIENTH__
-#define __DCCLIENTH__
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_

 
 

-#ifdef __GNUG__
-#pragma interface "dcclient.h"
-#endif
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 #include "wx/dc.h"
 
 #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 WXDLLEXPORT wxClientDC: public wxDC
+// ----------------------------------------------------------------------------
+// DC classes
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxClientDC)
+public:
+    // default ctor
+    wxWindowDCImpl( wxDC *owner );
+
+    // Create a DC corresponding to the whole window
+    wxWindowDCImpl( wxDC *owner, wxWindow *win );

 
 

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

 
 

-  // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
+protected:
+    // initialize the newly created DC
+    void InitDC();

 
 

-  ~wxClientDC(void);
+    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);

 };
 
 };
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxWindowDC)
+public:
+    // default ctor
+    wxClientDCImpl( wxDC *owner );
+
+    // Create a DC corresponding to the client area of the window
+    wxClientDCImpl( wxDC *owner, wxWindow *win );

 
 

- public:
-  wxWindowDC(void);
+    virtual ~wxClientDCImpl();

 
 

-  // Create a DC corresponding to a canvas
-  wxWindowDC(wxWindow *win);
+    virtual void DoGetSize(int *width, int *height) const;

 
 

-  ~wxWindowDC(void);
+protected:
+    void InitDC();
+
+    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);

 };
 
 };
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+public:
+    wxPaintDCImpl( wxDC *owner );
+
+    // Create a DC corresponding for painting the window in OnPaint()
+    wxPaintDCImpl( wxDC *owner, wxWindow *win );

 
 

- public:
-  wxPaintDC(void);
+    virtual ~wxPaintDCImpl();

 
 

-  // Create a DC corresponding to a canvas
-  wxPaintDC(wxWindow *win);
+    // find the entry for this DC in the cache (keyed by the window)
+    static WXHDC FindDCInCache(wxWindow* win);

 
 

-  ~wxPaintDC(void);
+protected:
+    static wxArrayDCInfo ms_cache;

 
 

- protected:
-    static WXHDC m_staticPaintHDC ;
-    static int m_staticPaintCount ;
+    // find the entry for this DC in the cache (keyed by the window)
+    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
+
+    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
+};
+
+/*
+ * wxPaintDCEx
+ * This class is used when an application sends an HDC with the WM_PAINT
+ * message. It is used in HandlePaint and need not be used by an application.
+ */
+
+class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
+{
+public:
+    wxPaintDCEx(wxWindow *canvas, WXHDC dc);
+    
+    DECLARE_CLASS(wxPaintDCEx)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);

 };
 
 #endif
 };
 
 #endif

-    // __DCCLIENTH__
+    // _WX_DCCLIENT_H_