Allow for Cmd-click on wxMac

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

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index b21b3dffffbdd807d12f86be5505c3cda4ef458c..0032639fe2d049e02a26a3ea6f7c58418051d1a4 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -53,9 +53,11 @@ public:
 
 
 
 
 
 

-#if defined(wxUSE_DC_OLD_METHODS)
+#if 1 // The < 2.4 and > 2.5.1.5 way

 
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
 
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);

+    %name(FloodFillPoint) bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);
+

     //bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const;
     %extend {
         wxColour GetPixel(wxCoord x, wxCoord y) {
     //bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const;
     %extend {
         wxColour GetPixel(wxCoord x, wxCoord y) {


@@ -63,30 +65,74 @@ public:
             self->GetPixel(x, y, &col);
             return col;
         }
             self->GetPixel(x, y, &col);
             return col;
         }

+        wxColour GetPixelPoint(const wxPoint& pt) {
+            wxColour col;
+            self->GetPixel(pt, &col);
+            return col;
+        }

     }
     }

+    

     void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

+    %name(DrawLinePoint) void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+

     void CrossHair(wxCoord x, wxCoord y);
     void CrossHair(wxCoord x, wxCoord y);

+    %name(CrossHairPoint) void CrossHair(const wxPoint& pt);
+

     void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc);
     void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc);

+    %name(DrawArcPoint) void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre);
+

     void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

+    %name(DrawCheckMarkRect) void DrawCheckMark(const wxRect& rect);
+

     void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea);
     void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea);

+    %name(DrawEllipticArcPointSize) void DrawEllipticArc(const wxPoint& pt, const wxSize& sz, double sa, double ea);
+

     void DrawPoint(wxCoord x, wxCoord y);
     void DrawPoint(wxCoord x, wxCoord y);

+    %name(DrawPointPoint) void DrawPoint(const wxPoint& pt);
+

     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect);
     void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect);

+    %name(DrawRectanglePointSize) void DrawRectangle(const wxPoint& pt, const wxSize& sz);
+

     void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius);
     void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius);

+    %name(DrawRoundedRectangleRect) void DrawRoundedRectangle(const wxRect& r, double radius);
+    %name(DrawRoundedRectanglePointSize) void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz, double radius);
+

     void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);
     void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);

+    %name(DrawCirclePoint) void DrawCircle(const wxPoint& pt, wxCoord radius);
+

     void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

+    %name(DrawEllipseRect) void DrawEllipse(const wxRect& rect);
+    %name(DrawEllipsePointSize) void DrawEllipse(const wxPoint& pt, const wxSize& sz);
+

     void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);

+    %name(DrawIconPoint) void DrawIcon(const wxIcon& icon, const wxPoint& pt);
+

     void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask = False);
     void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask = False);

+    %name(DrawBitmapPoint) void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt, bool useMask = False);
+

     void DrawText(const wxString& text, wxCoord x, wxCoord y);
     void DrawText(const wxString& text, wxCoord x, wxCoord y);

+    %name(DrawTextPoint) void DrawText(const wxString& text, const wxPoint& pt);
+

     void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);

+    %name(DrawRotatedTextPoint) void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle);
+

     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
               wxDC *source, wxCoord xsrc, wxCoord ysrc,
               int rop = wxCOPY, bool useMask = False,
               wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
     bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
               wxDC *source, wxCoord xsrc, wxCoord ysrc,
               int rop = wxCOPY, bool useMask = False,
               wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

+    %name(BlitPointSize) bool Blit(const wxPoint& destPt, const wxSize& sz,
+                                   wxDC *source, const wxPoint& srcPt,
+                                   int rop = wxCOPY, bool useMask = False,
+                                   const wxPoint& srcPtMask = wxDefaultPosition);

 
 
 
 

+    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    %name(SetClippingRegionPointSize) void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
+    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
+    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);

 
 

-#else  // The new way
+#else  // The doomed 2.5.1.5

 
     %name(FloodFillXY) bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
     bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);
 
     %name(FloodFillXY) bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
     bool FloodFill(const wxPoint& pt, const wxColour& col, int style = wxFLOOD_SURFACE);


@@ -105,6 +151,7 @@ public:
             return col;
         }
     }
             return col;
         }
     }

+    

     %name(DrawLineXY) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
 
     %name(DrawLineXY) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
 


@@ -160,6 +207,12 @@ public:
               int rop = wxCOPY, bool useMask = False,
               const wxPoint& srcPtMask = wxDefaultPosition);
 
               int rop = wxCOPY, bool useMask = False,
               const wxPoint& srcPtMask = wxDefaultPosition);
 

+    
+    %name(SetClippingRegionXY)void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
+    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);
+    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
+

 #endif
 
     void DrawLines(int points, wxPoint* points_array, wxCoord xoffset = 0, wxCoord yoffset = 0);
 #endif
 
     void DrawLines(int points, wxPoint* points_array, wxCoord xoffset = 0, wxCoord yoffset = 0);


@@ -168,12 +221,13 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 

-    // TODO:  Figure out what the start parameter means and devise a
-    // good typemap for this    
-    //void DrawPolyPolygon(int n, int start[], wxPoint points[],
-    //                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-    //                     int fillStyle = wxODDEVEN_RULE)
+    // TODO:  Figure out a good typemap for this...
+    //        Convert the first 3 args from a sequence of sequences?
+//     void DrawPolyPolygon(int n, int count[], wxPoint points[],
+//                           wxCoord xoffset = 0, wxCoord yoffset = 0,
+//                           int fillStyle = wxODDEVEN_RULE);

 
 

+    

     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and
     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and


@@ -222,14 +276,6 @@ public:
     virtual void SetPalette(const wxPalette& palette);
 
 
     virtual void SetPalette(const wxPalette& palette);
 
 

-    // clipping region
-    // ---------------
-
-    %name(SetClippingRegionXY)void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
-    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);
-    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
-

     virtual void DestroyClippingRegion();
 
     DocDeclA(
     virtual void DestroyClippingRegion();
 
     DocDeclA(


@@ -256,15 +302,16 @@ public:
     DocDeclAStr(
         void, GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT),
         "GetTextExtent(wxString string) -> (width, height)",
     DocDeclAStr(
         void, GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT),
         "GetTextExtent(wxString string) -> (width, height)",

-        "Get the width and height of the text using the current font.\n"
-        "Only works for single line strings.");
+        "Get the width and height of the text using the current font. Only
+works for single line strings.", "");
+

     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,
                             wxFont* font = NULL),
         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
     DocDeclAStrName(
         void, GetTextExtent(const wxString& string,
                             wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,
                             wxFont* font = NULL),
         "GetFullTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",

-        "Get the width, height, decent and leading of the text using the current or specified font.\n"
-        "Only works for single line strings.",
+        "Get the width, height, decent and leading of the text using the
+current or specified font. Only works for single line strings.", "",

         GetFullTextExtent);
 
 
         GetFullTextExtent);
 
 


@@ -274,8 +321,9 @@ public:
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),
         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",
                                      wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
                                      wxFont *font = NULL),
         "GetMultiLineTextExtent(wxString string, Font font=None) ->\n   (width, height, descent, externalLeading)",

-        "Get the width, height, decent and leading of the text using the current or specified font.\n"
-        "Works for single as well as multi-line strings.");
+        "Get the width, height, decent and leading of the text using the
+current or specified font. Works for single as well as multi-line
+strings.", "");

 
     
     %extend {
 
     
     %extend {


@@ -290,7 +338,7 @@ public:
     // size and resolution
     // -------------------
 
     // size and resolution
     // -------------------
 

-    DocStr(GetSize, "Get the DC size in device units.");
+    DocStr(GetSize, "Get the DC size in device units.", "");

     wxSize GetSize();
     DocDeclAName(
         void, GetSize( int *OUTPUT, int *OUTPUT ),
     wxSize GetSize();
     DocDeclAName(
         void, GetSize( int *OUTPUT, int *OUTPUT ),


@@ -298,7 +346,7 @@ public:
         GetSizeTuple);
 
 
         GetSizeTuple);
 
 

-    DocStr(GetSizeMM, "Get the DC size in milimeters.");
+    DocStr(GetSizeMM, "Get the DC size in milimeters.", "");

     wxSize GetSizeMM() const;
     DocDeclAName(
         void, GetSizeMM( int *OUTPUT, int *OUTPUT ) const,
     wxSize GetSizeMM() const;
     DocDeclAName(
         void, GetSizeMM( int *OUTPUT, int *OUTPUT ) const,


@@ -373,8 +421,13 @@ public:
         GetLogicalOriginTuple);
 
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
         GetLogicalOriginTuple);
 
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);

+    %extend {
+        void SetLogicalOriginPoint(const wxPoint& point) {
+            self->SetLogicalOrigin(point.x, point.y);
+        }
+    }

 
 

-
+    

     wxPoint GetDeviceOrigin() const;
     DocDeclAName(
         void, GetDeviceOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,
     wxPoint GetDeviceOrigin() const;
     DocDeclAName(
         void, GetDeviceOrigin(wxCoord *OUTPUT, wxCoord *OUTPUT) const,


@@ -382,6 +435,11 @@ public:
         GetDeviceOriginTuple);
 
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
         GetDeviceOriginTuple);
 
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);

+    %extend {
+        void SetDeviceOriginPoint(const wxPoint& point) {
+            self->SetDeviceOrigin(point.x, point.y);
+        }
+    }

 
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
 
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 


@@ -396,6 +454,12 @@ public:
     // ------------
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y);
     // ------------
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y);

+    %extend {
+        void CalcBoundingBoxPoint(const wxPoint& point) {
+            self->CalcBoundingBox(point.x, point.y);
+        }
+    }
+

     void ResetBoundingBox();
 
     // Get the final bounding box of the PostScript or Metafile picture.
     void ResetBoundingBox();
 
     // Get the final bounding box of the PostScript or Metafile picture.


@@ -414,6 +478,10 @@ public:
     %pythoncode { def __nonzero__(self): return self.Ok() };
 
 
     %pythoncode { def __nonzero__(self): return self.Ok() };
 
 

+#ifdef __WXMSW__
+    long GetHDC();
+#endif
+

 
     %extend { // See drawlist.cpp for impplementaion of these...
         PyObject* _DrawPointList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
 
     %extend { // See drawlist.cpp for impplementaion of these...
         PyObject* _DrawPointList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)


@@ -558,6 +626,8 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) {
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxMemoryDC);
+

 class wxMemoryDC : public wxDC {
 public:
     wxMemoryDC();
 class wxMemoryDC : public wxDC {
 public:
     wxMemoryDC();


@@ -571,95 +641,11 @@ public:
 
 
 %{
 
 
 %{

-//-=-=-=-=-=-=-=-=-=-=-    
-#if 0

 #include <wx/dcbuffer.h>
 #include <wx/dcbuffer.h>

-#else
-
-
-//  Temporarily put a set of classes here similar to the old buffered DC
-//  classes until the real ones can be fixed to work "correctly" again.
-
-class wxBufferedDC : public wxMemoryDC
-{
-private:
-    wxDC        *m_dc;
-    wxBitmap    m_buffer;
-
-public:
-
-    wxBufferedDC() : m_dc( 0 ) {}
-    
-    wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
-        : m_dc( dc ), m_buffer( buffer )
-    {
-        SelectObject( m_buffer );
-    }
-       
-    wxBufferedDC( wxDC *dc, const wxSize &area )
-        : m_dc( dc ), m_buffer( area.GetWidth(), area.GetHeight() )
-    {
-        SelectObject( m_buffer );
-    }
-
-    ~wxBufferedDC() {
-        if( m_dc != 0 )
-            UnMask();
-    }
-
-
-    void Init( wxDC *dc, const wxBitmap &buffer ) {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = buffer;
-        SelectObject( m_buffer );
-    }
-
-    void Init( wxDC *dc, const wxSize &area ) {
-        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
-                      _T("wxBufferedDC already initialised") );
-        m_dc = dc;
-        m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() );
-        SelectObject( m_buffer );
-    }
-
-    void UnMask() {
-        wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") );
-        m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 );
-        m_dc = 0;
-    }
-};
- 
-
-class wxBufferedPaintDC : public wxBufferedDC
-{
-private:
-    wxPaintDC    m_paintdc;
-
-public:
-    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap )
-        : m_paintdc( window )
-    {
-        window->PrepareDC( m_paintdc );
-
-        if( buffer != wxNullBitmap )
-            Init( &m_paintdc, buffer );
-        else
-            Init( &m_paintdc, window->GetClientSize() );
-    }
-        
-    ~wxBufferedPaintDC() {
-        UnMask();
-    }
-};
-
-#endif
-//-=-=-=-=-=-=-=-=-=-=-    

 %}
 
 
 %}
 
 

-
+MustHaveApp(wxBufferedDC);

 
 class wxBufferedDC : public wxMemoryDC
 {
 
 class wxBufferedDC : public wxMemoryDC
 {


@@ -698,6 +684,7 @@ public:
 
 
 
 
 
 

+MustHaveApp(wxBufferedPaintDC);

 
 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.
 
 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.


@@ -714,6 +701,8 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxScreenDC);
+

 class wxScreenDC : public wxDC {
 public:
     wxScreenDC();
 class wxScreenDC : public wxDC {
 public:
     wxScreenDC();


@@ -726,6 +715,8 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxClientDC);
+

 class wxClientDC : public wxDC {
 public:
       wxClientDC(wxWindow* win);
 class wxClientDC : public wxDC {
 public:
       wxClientDC(wxWindow* win);


@@ -734,6 +725,8 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxPaintDC);
+

 class wxPaintDC : public wxDC {
 public:
       wxPaintDC(wxWindow* win);
 class wxPaintDC : public wxDC {
 public:
       wxPaintDC(wxWindow* win);


@@ -742,6 +735,8 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxWindowDC);
+

 class wxWindowDC : public wxDC {
 public:
       wxWindowDC(wxWindow* win);
 class wxWindowDC : public wxDC {
 public:
       wxWindowDC(wxWindow* win);


@@ -750,6 +745,8 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxMirrorDC);
+

 class wxMirrorDC : public wxDC
 {
 public:
 class wxMirrorDC : public wxDC
 {
 public:


@@ -769,6 +766,8 @@ public:
 #include <wx/dcps.h>
 %}
 
 #include <wx/dcps.h>
 %}
 

+MustHaveApp(wxPostScriptDC);
+

 class wxPostScriptDC : public wxDC {
 public:
     wxPostScriptDC(const wxPrintData& printData);
 class wxPostScriptDC : public wxDC {
 public:
     wxPostScriptDC(const wxPrintData& printData);


@@ -787,7 +786,11 @@ public:
 %newgroup
 
 
 %newgroup
 
 

-#ifdef __WXMSW__
+MustHaveApp(wxMetaFile);
+MustHaveApp(wxMetaFileDC);
+
+
+#if defined(__WXMSW__) || defined(__WXMAC__)

 
 %{
 #include <wx/metafile.h>
 
 %{
 #include <wx/metafile.h>


@@ -805,8 +808,10 @@ public:
     int GetWidth();
     int GetHeight();
 
     int GetWidth();
     int GetHeight();
 

+#ifdef __WXMSW__

     const wxString& GetFileName() const;
     const wxString& GetFileName() const;

-
+#endif
+    

     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 


@@ -859,6 +864,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxPrinterDC);
+

 #if defined(__WXMSW__) || defined(__WXMAC__)
 
 class  wxPrinterDC : public wxDC {
 #if defined(__WXMSW__) || defined(__WXMAC__)
 
 class  wxPrinterDC : public wxDC {


@@ -901,6 +908,8 @@ public:
 // compatible with the DC Draw methods in 2.4.  See also wxPython/_wx.py.
 
 
 // compatible with the DC Draw methods in 2.4.  See also wxPython/_wx.py.
 
 

+#if 0
+

 %define MAKE_OLD_DC_CLASS(classname)
     %pythoncode {
     class classname##_old(classname):
 %define MAKE_OLD_DC_CLASS(classname)
     %pythoncode {
     class classname##_old(classname):


@@ -938,5 +947,6 @@ MAKE_OLD_DC_CLASS(PostScriptDC);
 MAKE_OLD_DC_CLASS(MetaFileDC);
 MAKE_OLD_DC_CLASS(PrinterDC);
 
 MAKE_OLD_DC_CLASS(MetaFileDC);
 MAKE_OLD_DC_CLASS(PrinterDC);
 

+#endif

 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------