-#ifndef __DCCLIENTH_BASE__
-#define __DCCLIENTH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/dcclient.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/dcclient.h"
-#elif defined(__GTK__)
-#include "wx/gtk/dcclient.h"
-#endif
-
-#endif
- // __DCCLIENTH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/dcclient.h
+// Purpose: wxClientDC base header
+// Author: Julian Smart
+// Copyright: (c) Julian Smart
+// Licence: wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DCCLIENT_H_BASE_
+#define _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_