From: Robin Dunn <robin@alldunn.com>
Date: Tue, 3 Oct 2006 21:30:57 +0000 (+0000)
Subject: Change wx.DC inheritance hierarchy to match reality
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/205d49f79e084d964b7f91388ec92d53ab4700a7

Change wx.DC inheritance hierarchy to match reality


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index a89bad61b7..75e80deaaa 100644
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -1448,6 +1448,23 @@ to some applications.", "");
 //---------------------------------------------------------------------------
 %newgroup
 
+MustHaveApp(wxWindowDC);
+
+DocStr(wxWindowDC,
+       "A wx.WindowDC must be constructed if an application wishes to paint on
+the whole area of a window (client and decorations). This should
+normally be constructed as a temporary stack object; don't store a
+wx.WindowDC object.","");
+class wxWindowDC : public wxDC {
+public:
+    DocCtorStr(
+        wxWindowDC(wxWindow* win),
+        "Constructor. Pass the window on which you wish to paint.","");
+};
+
+//---------------------------------------------------------------------------
+%newgroup
+
 MustHaveApp(wxClientDC);
 
 DocStr(wxClientDC,
@@ -1462,7 +1479,7 @@ To draw on a window from within an EVT_PAINT handler, construct a
 To draw on the whole window including decorations, construct a
 `wx.WindowDC` object (Windows only).
 ", "");
-class wxClientDC : public wxDC {
+class wxClientDC : public wxWindowDC {
 public:
     DocCtorStr(
         wxClientDC(wxWindow* win),
@@ -1489,7 +1506,7 @@ window. Attempts to draw outside this area do not appear.
 To draw on a window from outside EVT_PAINT handlers, construct a
 `wx.ClientDC` object.
 ","");
-class wxPaintDC : public wxDC {
+class wxPaintDC : public wxClientDC {
 public:
     DocCtorStr(
         wxPaintDC(wxWindow* win),
@@ -1499,23 +1516,6 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
-MustHaveApp(wxWindowDC);
-
-DocStr(wxWindowDC,
-       "A wx.WindowDC must be constructed if an application wishes to paint on
-the whole area of a window (client and decorations). This should
-normally be constructed as a temporary stack object; don't store a
-wx.WindowDC object.","");
-class wxWindowDC : public wxDC {
-public:
-    DocCtorStr(
-        wxWindowDC(wxWindow* win),
-        "Constructor. Pass the window on which you wish to paint.","");
-};
-
-//---------------------------------------------------------------------------
-%newgroup
-
 MustHaveApp(wxMirrorDC);
 
 DocStr(wxMirrorDC,