changing the Multiple Inheritance along the Single Inheritance, patch 1623801

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 0c2cca05858a4d1aaca46b02379735e1e9c4d0a6..b85000d9d049471b7acf66524ac9ae0ac3d7e06e 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -5,8 +5,8 @@
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_


@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma interface "dcclient.h"
-#endif
-

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


@@ -46,11 +42,14 @@ public:
     wxWindowDC(wxWindow *win);
 
 protected:
     wxWindowDC(wxWindow *win);
 
 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:
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)

 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC


@@ -67,8 +66,11 @@ public:
 protected:
     void InitDC();
 
 protected:
     void InitDC();
 

+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)

 };
 
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 };
 
 class WXDLLEXPORT wxPaintDC : public wxClientDC


@@ -91,7 +93,25 @@ protected:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
 private:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    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