make wxSortedArrayString::Sort() and Insert() private in STL build (closes #10947)

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

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 3397bf623931d72e9cc243aed5d13b00375c9f86..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
-// Modified by:
-// Created:
 // Copyright:   (c) Julian Smart
 // RCS-ID:      $Id$
 // Licence:     wxWindows Licence
@@ -12,27 +10,54 @@
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 
-#if defined(__WXPALMOS__)
-#include "wx/palmos/dcclient.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/dcclient.h"
-#elif defined(__WXMOTIF__)
-#include "wx/motif/dcclient.h"
-#elif defined(__WXGTK20__)
-#include "wx/gtk/dcclient.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk1/dcclient.h"
-#elif defined(__WXX11__)
-#include "wx/x11/dcclient.h"
-#elif defined(__WXMGL__)
-#include "wx/mgl/dcclient.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/dcclient.h"
-#elif defined(__WXCOCOA__)
-#include "wx/cocoa/dcclient.h"
-#elif defined(__WXPM__)
-#include "wx/os2/dcclient.h"
-#endif
-
-#endif
-    // _WX_DCCLIENT_H_BASE_
+#include "wx/dc.h"
+
+//-----------------------------------------------------------------------------
+// wxWindowDC
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
+{
+public:
+    wxWindowDC(wxWindow *win);
+
+protected:
+    wxWindowDC(wxDCImpl *impl) : wxDC(impl) { }
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxWindowDC)
+};
+
+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
+{
+public:
+    wxClientDC(wxWindow *win);
+
+protected:
+    wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { }
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxClientDC)
+};
+
+//-----------------------------------------------------------------------------
+// wxPaintDC
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
+{
+public:
+    wxPaintDC(wxWindow *win);
+
+protected:
+    wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { }
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxPaintDC)
+};
+
+#endif // _WX_DCCLIENT_H_BASE_