Applied patch, fixes #12090: wxGTK cursor handling revamp

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

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 5db0f6127382e7b5fb7af27aed9c59c819c8edc1..60e9fa57a608d6a5438d865377ba402233d471ca 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -1,13 +1,63 @@
-#ifndef __DCCLIENTH_BASE__
-#define __DCCLIENTH_BASE__
-
-#if defined(__WXMSW__)
-#include "wx/msw/dcclient.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/dcclient.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/dcclient.h"
-#endif
-
-#endif
-    // __DCCLIENTH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcclient.h
+// Purpose:     wxClientDC base header
+// Author:      Julian Smart
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// 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_