Move unused values into 2.4 compatibility. Source cleaning.

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 126eb39076a9e6978b110ff67b57e9184c13509b..1b021ba8e9750e282805a094fa7db8a0a0a89c63 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -5,60 +5,117 @@
 // 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 _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#ifdef __GNUG__
-#pragma interface "dcclient.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "dcclient.h"

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

+#include "wx/dynarray.h"
+
+// ----------------------------------------------------------------------------
+// array types
+// ----------------------------------------------------------------------------
+
+// this one if used by wxPaintDC only
+struct WXDLLEXPORT wxPaintDCInfo;
+
+WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);

 
 

-class WXDLLEXPORT wxClientDC: public wxDC
+// ----------------------------------------------------------------------------
+// DC classes
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindowDC : public wxDC

 {
 {

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

 
 

- public:
-  wxClientDC(void);
+protected:
+    // intiialize the newly created DC
+    void InitDC();

 
 

-  // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;

 
 

-  ~wxClientDC(void);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)

 };
 
 };
 

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

 {
 {

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

 
 

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

 
 

-  // Create a DC corresponding to a canvas
-  wxWindowDC(wxWindow *win);
+protected:
+    void InitDC();

 
 

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

 };
 
 };
 

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

 {
 {

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

 
 

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

 
 

-  // 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 ms_PaintHDC;
-    static uint  ms_PaintCount;
+    // find the entry for this DC in the cache (keyed by the window)
+    wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
+};
+
+/*
+ * 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 WXDLLEXPORT wxPaintDCEx : public wxPaintDC
+{
+public:
+    wxPaintDCEx(wxWindow *canvas, WXHDC dc);
+    virtual ~wxPaintDCEx();
+private:
+    int saveState;
+
+    DECLARE_CLASS(wxPaintDCEx)
+    DECLARE_NO_COPY_CLASS(wxPaintDCEx)

 };
 
 #endif
 };
 
 #endif