make sure the cleanup happens

[wxWidgets.git] / wxPython / src / _dc.i

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index ae2a5ad49e7ef4339e35d5b93b0564d879c4c5a8..75e80deaaabcf3c1b78c368390d5f4029e023439 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -586,7 +586,7 @@ current or specified font. Only works for single line strings.", "",
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),
         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, lineHeight)",
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),
         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, lineHeight)",

-        "Get the width, height, decent and leading of the text using the
+        "Get the width, height, and line height of the text using the

 current or specified font. Works for single as well as multi-line
 strings.", "");
 
 current or specified font. Works for single as well as multi-line
 strings.", "");
 


@@ -1287,10 +1287,14 @@ on it, everything is in fact first drawn on an in-memory buffer (a
 `wx.Bitmap`) and then copied to the screen only once, when this object
 is destroyed.
 
 `wx.Bitmap`) and then copied to the screen only once, when this object
 is destroyed.
 

-It can be used in the same way as any other device
-context. wx.BufferedDC itself typically replaces `wx.ClientDC`, if you
-want to use it in your EVT_PAINT handler, you should look at
+It can be used in the same way as any other device context.
+wx.BufferedDC itself typically replaces `wx.ClientDC`, if you want to
+use it in your EVT_PAINT handler, you should look at

 `wx.BufferedPaintDC`.
 `wx.BufferedPaintDC`.

+
+Please note that GTK+ 2.0 and OS X provide double buffering themselves
+natively so using this class on those platforms will normally result
+in an unneeded level of buffering.

 ", "");
 
 class wxBufferedDC : public wxMemoryDC
 ", "");
 
 class wxBufferedDC : public wxMemoryDC


@@ -1444,6 +1448,23 @@ to some applications.", "");
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %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,
 MustHaveApp(wxClientDC);
 
 DocStr(wxClientDC,


@@ -1458,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).
 ", "");
 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),
 public:
     DocCtorStr(
         wxClientDC(wxWindow* win),


@@ -1485,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.
 ","");
 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),
 public:
     DocCtorStr(
         wxPaintDC(wxWindow* win),


@@ -1495,23 +1516,6 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %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,
 MustHaveApp(wxMirrorDC);
 
 DocStr(wxMirrorDC,


@@ -1561,6 +1565,8 @@ output. Default is 720ppi.", "");
     DocDeclStr(
         static int , GetResolution(),
         "Return resolution used in PostScript output.", "");
     DocDeclStr(
         static int , GetResolution(),
         "Return resolution used in PostScript output.", "");

+
+    %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`");

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