added template wxScopedArray<> too

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

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 27aae06a02dbd3b7d4ab73e2c438b1b9208bdb32..60e9fa57a608d6a5438d865377ba402233d471ca 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -2,8 +2,6 @@
 // Name:        wx/dcclient.h
 // Purpose:     wxClientDC base header
 // Author:      Julian Smart
 // Name:        wx/dcclient.h
 // Purpose:     wxClientDC base header
 // Author:      Julian Smart

-// Modified by:
-// Created:

 // Copyright:   (c) Julian Smart
 // RCS-ID:      $Id$
 // Licence:     wxWindows Licence
 // Copyright:   (c) Julian Smart
 // RCS-ID:      $Id$
 // Licence:     wxWindows Licence


@@ -21,11 +19,13 @@
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
+    wxWindowDC(wxWindow *win);
+
+protected:
+    wxWindowDC(wxDCImpl *impl) : wxDC(impl) { }

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_ABSTRACT_CLASS(wxWindowDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -35,11 +35,13 @@ private:
 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
 {
 public:
 class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
 {
 public:

-    wxClientDC();
-    wxClientDC( wxWindow *win );
+    wxClientDC(wxWindow *win);
+
+protected:
+    wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { }

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_ABSTRACT_CLASS(wxClientDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -49,12 +51,13 @@ private:
 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
 {
 public:
 class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
 {
 public:

-    wxPaintDC();
-    wxPaintDC( wxWindow *win );
+    wxPaintDC(wxWindow *win);
+
+protected:
+    wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { }

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_ABSTRACT_CLASS(wxPaintDC)

 };
 
 };
 

-#endif
-    // _WX_DCCLIENT_H_BASE_
+#endif // _WX_DCCLIENT_H_BASE_