X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ef86e32ddee8d77078b1e18affa3cadcdc420d2..d359a38002a9a577fcd7c16ca3ed0f2e874bded7:/wxPython/src/gdi.i

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index d3fe92e1ae..cbeed1abe3 100644
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -1,1290 +1,59 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdi.i
-// Purpose:     SWIG interface file for wxDC, wxBrush, wxPen, etc.
+// Name:        controls.i
+// Purpose:     Control (widget) classes for wxPython
 //
 // Author:      Robin Dunn
 //
-// Created:     7/7/97
+// Created:     7-July-1997
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
+// Copyright:   (c) 2003 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-%module gdi
-
-%{
-#include "helpers.h"
-#include <wx/imaglist.h>
-#include <wx/fontmap.h>
-#include <wx/fontenc.h>
-#include <wx/fontmap.h>
-#include <wx/fontutil.h>
-#include <wx/dcbuffer.h>
-#include <wx/dcmirror.h>
-#include <wx/iconbndl.h>
-%}
-
-//----------------------------------------------------------------------
-
-%include typemaps.i
-%include my_typemaps.i
-
-// Import some definitions of other classes, etc.
-%import _defs.i
-%import misc.i
-%import fonts.i
-
-%pragma(python) code = "import wx"
-
-//---------------------------------------------------------------------------
-%{
-    // Put some wx default wxChar* values into wxStrings.
-    static const wxString wxPyEmptyString(wxT(""));
-%}
-//---------------------------------------------------------------------------
-
-class wxGDIObject : public wxObject {
-public:
-    wxGDIObject();
-    ~wxGDIObject();
-
-    bool GetVisible();
-    void SetVisible( bool visible );
-
-    bool IsNull();
-
-};
-
-//---------------------------------------------------------------------------
-
-
-// TODO:  When the API stabalizes and is available on other platforms, add
-// wrappers for the new wxBitmap, wxRawBitmap, wxDIB stuff...
-
-class wxBitmap : public wxGDIObject
-{
-public:
-    wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY);
-    ~wxBitmap();
-
-    wxPalette* GetPalette();
-    wxMask* GetMask();
-    bool LoadFile(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY);
-    bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL);
-    void SetMask(wxMask* mask);
-    %pragma(python) addtoclass = "
-    def SetMaskColour(self, colour):
-        mask = wxMaskColour(self, colour)
-        self.SetMask(mask)
-    "
-#ifdef __WXMSW__
-    void SetPalette(wxPalette& palette);
-#endif
-
-    // wxGDIImage methods
-#ifdef __WXMSW__
-    long GetHandle();
-    void SetHandle(long handle);
-#endif
-    bool Ok();
-    int GetWidth();
-    int GetHeight();
-    int GetDepth();
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-#ifdef __WXMSW__
-    void SetSize(const wxSize& size);
-#endif
-
-    wxBitmap GetSubBitmap( const wxRect& rect );
-    bool CopyFromIcon(const wxIcon& icon);
-#ifdef __WXMSW__
-    bool CopyFromCursor(const wxCursor& cursor);
-    int GetQuality();
-    void SetQuality(int q);
-#endif
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-
-// Declarations of some alternate "constructors"
-%new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1);
-%new wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings);
-%new wxBitmap* wxBitmapFromIcon(const wxIcon& icon);
-%new wxBitmap* wxBitmapFromBits(PyObject* bits, int width, int height, int depth = 1 );
-
-//  #ifdef __WXMSW__
-//  %new wxBitmap* wxBitmapFromData(PyObject* data, long type,
-//                                  int width, int height, int depth = 1);
-//  #endif
-
-
-
-%{ // Implementations of some alternate "constructors"
-
-    wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
-        return new wxBitmap(width, height, depth);
-    }
-
-    static char** ConvertListOfStrings(PyObject* listOfStrings) {
-        char**    cArray = NULL;
-        int       count;
-
-        if (!PyList_Check(listOfStrings)) {
-            PyErr_SetString(PyExc_TypeError, "Expected a list of strings.");
-            return NULL;
-        }
-        count = PyList_Size(listOfStrings);
-        cArray = new char*[count];
-
-        for(int x=0; x<count; x++) {
-            // TODO: Need some validation and error checking here
-            cArray[x] = PyString_AsString(PyList_GET_ITEM(listOfStrings, x));
-        }
-        return cArray;
-    }
-
-
-    wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings) {
-        char**    cArray = NULL;
-        wxBitmap* bmp;
-
-        cArray = ConvertListOfStrings(listOfStrings);
-        if (! cArray)
-            return NULL;
-        bmp = new wxBitmap(cArray);
-        delete [] cArray;
-        return bmp;
-    }
-
-
-    wxBitmap* wxBitmapFromIcon(const wxIcon& icon) {
-        return new wxBitmap(icon);
-    }
-
-
-    wxBitmap* wxBitmapFromBits(PyObject* bits, int width, int height, int depth = 1 ) {
-        char* buf;
-        int   length;
-        PyString_AsStringAndSize(bits, &buf, &length);
-        return new wxBitmap(buf, width, height, depth);
-    }
-
-
-//  #ifdef __WXMSW__
-//      wxBitmap* wxBitmapFromData(PyObject* data, long type,
-//                                 int width, int height, int depth = 1) {
-//          if (! PyString_Check(data)) {
-//              PyErr_SetString(PyExc_TypeError, "Expected string object");
-//              return NULL;
-//          }
-//          return new wxBitmap((void*)PyString_AsString(data), type, width, height, depth);
-//      }
-//  #endif
-%}
+%module(package="wx") _gdi
 
 //---------------------------------------------------------------------------
 
-class wxMask : public wxObject {
-public:
-    wxMask(const wxBitmap& bitmap);
-    //~wxMask();
-
-    %addmethods { void Destroy() { delete self; } }
-};
-
-%new wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour);
 %{
-    wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour) {
-        return new wxMask(bitmap, colour);
-    }
-%}
-
-
-//---------------------------------------------------------------------------
-
-
-class wxIcon : public wxGDIObject
-{
-public:
-    wxIcon(const wxString& name, long flags,
-           int desiredWidth = -1, int desiredHeight = -1);
-    ~wxIcon();
-
-#ifndef __WXMAC__
-    bool LoadFile(const wxString& name, long flags);
-#endif
-
-    // wxGDIImage methods
-#ifdef __WXMSW__
-    long GetHandle();
-    void SetHandle(long handle);
-#endif
-    bool Ok();
-    int GetWidth();
-    int GetHeight();
-    int GetDepth();
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-#ifdef __WXMSW__
-    void SetSize(const wxSize& size);
-#endif
-    void CopyFromBitmap(const wxBitmap& bmp);
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-
-// Declarations of some alternate "constructors"
-%new wxIcon* wxEmptyIcon();
-%new wxIcon* wxIconFromXPMData(PyObject* listOfStrings);
-%new wxIcon* wxIconFromBitmap(const wxBitmap& bmp);
-%new wxIcon* wxIconFromLocation(const wxIconLocation& loc);
-
-%{ // Implementations of some alternate "constructors"
-    wxIcon* wxEmptyIcon() {
-        return new wxIcon();
-    }
-
-    wxIcon* wxIconFromXPMData(PyObject* listOfStrings) {
-        char**  cArray = NULL;
-        wxIcon* icon;
-
-        cArray = ConvertListOfStrings(listOfStrings);
-        if (! cArray)
-            return NULL;
-        icon = new wxIcon(cArray);
-        delete [] cArray;
-        return icon;
-    }
-
-    wxIcon* wxIconFromBitmap(const wxBitmap& bmp) {
-        wxIcon* icon = new wxIcon();
-        icon->CopyFromBitmap(bmp);
-        return icon;
-    }
-
-    wxIcon* wxIconFromLocation(const wxIconLocation& loc) {
-        wxIcon* icon = new wxIcon(loc);
-        return icon;
-    }
+#include "wx/wxPython/wxPython.h"
+#include "wx/wxPython/pyclasses.h"
+    
 %}
 
-
 //---------------------------------------------------------------------------
 
-class wxIconLocation
-{
-public:
-    // ctor takes the name of the file where the icon is
-    %addmethods {
-        wxIconLocation(const wxString* filename = &wxPyEmptyString, int num = 0) {
-#ifdef __WXMSW__
-            return new wxIconLocation(*filename, num);
-#else
-            return new wxIconLocation(*filename);
-#endif
-        }
-    }
-
-    ~wxIconLocation();
-
-
-    // returns true if this object is valid/initialized
-    bool IsOk() const;
+%import core.i
+%pythoncode { wx = _core }
 
-    // set/get the icon file name
-    void SetFileName(const wxString& filename);
-    const wxString& GetFileName() const;
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
-    %addmethods {
-        void SetIndex(int num) {
-#ifdef __WXMSW__
-            self->SetIndex(num);
-#else
-            // do nothing
-#endif
-        }
-
-        int GetIndex() {
-#ifdef __WXMSW__
-            return self->GetIndex();
-#else
-            return -1;
-#endif
-        }
-    }
-};
 
+// Include all the files that make up this module
 
+%include _gdiobj.i
+%include _colour.i
+%include _palette.i
+%include _pen.i 
+%include _brush.i
+%include _bitmap.i
+%include _icon.i
+%include _cursor.i
+%include _region.i
+%include _font.i
+%include _intl.i
+%include _dc.i
+%include _graphics.i
+%include _overlay.i
+%include _imaglist.i
+%include _stockobjs.i
+%include _effects.i
+%include _renderer.i
+%include _pseudodc.i
 
 //---------------------------------------------------------------------------
-
-class wxIconBundle
-{
-public:
-    // default constructor
-    wxIconBundle();
-
-    // initializes the bundle with the icon(s) found in the file
-    %name(wxIconBundleFromFile) wxIconBundle( const wxString& file, long type );
-
-    // initializes the bundle with a single icon
-    %name(wxIconBundleFromIcon)wxIconBundle( const wxIcon& icon );
-
-    ~wxIconBundle();
-
-    // adds the icon to the collection, if the collection already
-    // contains an icon with the same width and height, it is
-    // replaced
-    void AddIcon( const wxIcon& icon );
-
-    // adds all the icons contained in the file to the collection,
-    // if the collection already contains icons with the same
-    // width and height, they are replaced
-    %name(AddIconFromFile)void AddIcon( const wxString& file, long type );
-
-    // returns the icon with the given size; if no such icon exists,
-    // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,
-    // returns the first icon in the bundle
-    const wxIcon& GetIcon( const wxSize& size ) const;
-};
-
-//---------------------------------------------------------------------------
-
-class wxCursor : public wxGDIObject
-{
-public:
-    %addmethods {
-        wxCursor(const wxString* cursorName, long flags, int hotSpotX=0, int hotSpotY=0) {
-#ifdef __WXGTK__
-            wxCHECK_MSG(FALSE, NULL,
-                        wxT("wxCursor constructor not implemented for wxGTK, use wxStockCursor, wxCursorFromImage, or wxCursorFromBits instead."));
-#else
-            return new wxCursor(*cursorName, flags, hotSpotX, hotSpotY);
-#endif
-        }
-    }
-
-    ~wxCursor();
-
-    // wxGDIImage methods
-#ifdef __WXMSW__
-    long GetHandle();
-    void SetHandle(long handle);
-#endif
-    bool Ok();
-#ifdef __WXMSW__
-    int GetWidth();
-    int GetHeight();
-    int GetDepth();
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-    void SetSize(const wxSize& size);
-#endif
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-%name(wxStockCursor) %new wxCursor* wxPyStockCursor(int id);
-%new wxCursor* wxCursorFromImage(const wxImage& image);
-%new wxCursor* wxCursorFromBits(PyObject* bits, int width, int  height,
-                                int hotSpotX=-1, int hotSpotY=-1,
-                                PyObject* maskBits=0);
-
-%{
-    wxCursor* wxPyStockCursor(int id) {
-        return new wxCursor(id);
-    }
-
-    wxCursor* wxCursorFromImage(const wxImage& image) {
-        return new wxCursor(image);
-    }
-
-    wxCursor* wxCursorFromBits(PyObject* bits, int width, int  height,
-                               int hotSpotX=-1, int hotSpotY=-1,
-                               PyObject* maskBits=0) {
-        char* bitsbuf;
-        char* maskbuf = NULL;
-        int   length;
-        PyString_AsStringAndSize(bits, &bitsbuf, &length);
-        if (maskBits)
-            PyString_AsStringAndSize(maskBits, &maskbuf, &length);
-        return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf);
-    }
-%}
-
-//----------------------------------------------------------------------
-
-class wxColour : public wxObject {
-public:
-    wxColour(unsigned char red=0, unsigned char green=0, unsigned char blue=0);
-    ~wxColour();
-    unsigned char Red();
-    unsigned char Green();
-    unsigned char Blue();
-    bool Ok();
-    void Set(unsigned char red, unsigned char green, unsigned char blue);
-    %addmethods {
-        PyObject* Get() {
-            PyObject* rv = PyTuple_New(3);
-            int red = -1;
-            int green = -1;
-            int blue = -1;
-            if (self->Ok()) {
-                red =   self->Red();
-                green = self->Green();
-                blue =  self->Blue();
-            }
-            PyTuple_SetItem(rv, 0, PyInt_FromLong(red));
-            PyTuple_SetItem(rv, 1, PyInt_FromLong(green));
-            PyTuple_SetItem(rv, 2, PyInt_FromLong(blue));
-            return rv;
-        }
-        bool __eq__(PyObject* obj) {
-            wxColour  tmp;
-            wxColour* ptr = &tmp;
-            if (obj == Py_None)    return FALSE;
-            wxPyBLOCK_THREADS(bool success = wxColour_helper(obj, &ptr); PyErr_Clear());
-            if (! success)         return FALSE;
-            return *self == *ptr;
-        }
-        bool __ne__(PyObject* obj) {
-            wxColour  tmp;
-            wxColour* ptr = &tmp;
-            if (obj == Py_None)    return TRUE;
-            wxPyBLOCK_THREADS(bool success = wxColour_helper(obj, &ptr); PyErr_Clear());
-            if (! success)         return TRUE;
-            return *self != *ptr;
-        }
-    }
-
-    %pragma(python) addtoclass = "asTuple = Get
-    def __str__(self):                  return str(self.asTuple())
-    def __repr__(self):                 return 'wxColour:' + str(self.asTuple())
-    def __nonzero__(self):              return self.Ok()
-    def __getinitargs__(self):          return ()
-    def __getstate__(self):             return self.asTuple()
-    def __setstate__(self, state):      self.Set(*state)
-"
-
-};
-
-%new wxColour* wxNamedColour(const wxString& colorName);
-
-%{                                      // Alternate 'constructor'
-    wxColour* wxNamedColour(const wxString& colorName) {
-        return new wxColour(colorName);
-    }
+%init %{
+    // Work around a chicken/egg problem in drawlist.cpp
+    wxPyDrawList_SetAPIPtr();
 %}
 
-
-
-class wxColourDatabase : public wxObject {
-public:
-
-    wxColour *FindColour(const wxString& colour) ;
-    wxColour *FindColourNoAdd(const wxString& colour) const;
-    wxString FindName(const wxColour& colour) const;
-
-    %addmethods {
-        void AddColour(const wxString& name, wxColour* colour) {
-            // make a copy since the python one will be GC'd
-            wxColour* c = new wxColour(*colour);
-            self->AddColour(name, c);
-        }
-
-        void Append(const wxString& name, int red, int green, int blue) {
-            wxColour* c = new wxColour(red, green, blue);
-            self->AddColour(name, c);
-        }
-    }
-};
-
-
-//----------------------------------------------------------------------
-
-class wxPen : public wxGDIObject {
-public:
-    wxPen(wxColour& colour, int width=1, int style=wxSOLID);
-    ~wxPen();
-
-    int GetCap();
-    wxColour GetColour();
-
-    int GetJoin();
-    int GetStyle();
-    int GetWidth();
-    bool Ok();
-    void SetCap(int cap_style);
-    void SetColour(wxColour& colour);
-    void SetJoin(int join_style);
-    void SetStyle(int style);
-    void SetWidth(int width);
-
-
-    void SetDashes(int LCOUNT, wxDash* choices);
-    //int GetDashes(wxDash **dashes);
-    %addmethods {
-        PyObject* GetDashes() {
-            wxDash* dashes;
-            int count = self->GetDashes(&dashes);
-            wxPyBeginBlockThreads();
-            PyObject* retval = PyList_New(0);
-            for (int x=0; x<count; x++)
-                PyList_Append(retval, PyInt_FromLong(dashes[x]));
-            wxPyEndBlockThreads();
-            return retval;
-        }
-    }
-
-#ifdef __WXMSW__
-    wxBitmap* GetStipple();
-    void SetStipple(wxBitmap& stipple);
-#endif
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-
-
-
-// The list of ints for the dashes needs to exist for the life of the pen
-// so we make it part of the class to save it.  wxPyPen is aliased to wxPen
-// in _extras.py
-
-%{
-class wxPyPen : public wxPen {
-public:
-    wxPyPen(wxColour& colour, int width=1, int style=wxSOLID)
-        : wxPen(colour, width, style)
-        { m_dash = NULL; }
-    ~wxPyPen() {
-        if (m_dash)
-            delete [] m_dash;
-    }
-
-    void SetDashes(int nb_dashes, const wxDash *dash) {
-        if (m_dash)
-            delete [] m_dash;
-        m_dash = new wxDash[nb_dashes];
-        for (int i=0; i<nb_dashes; i++) {
-            m_dash[i] = dash[i];
-        }
-        wxPen::SetDashes(nb_dashes, m_dash);
-    }
-
-private:
-    wxDash* m_dash;
-};
-%}
-
-
-class wxPyPen : public wxPen {
-public:
-    wxPyPen(wxColour& colour, int width=1, int style=wxSOLID);
-    ~wxPyPen();
-
-    void SetDashes(int LCOUNT, wxDash* choices);
-};
-
-
-
-
-class wxPenList : public wxObject {
-public:
-
-    void AddPen(wxPen* pen);
-    wxPen* FindOrCreatePen(const wxColour& colour, int width, int style);
-    void RemovePen(wxPen* pen);
-
-    int GetCount();
-};
-
-
-
-//----------------------------------------------------------------------
-
-class wxBrush : public wxGDIObject {
-public:
-    wxBrush(const wxColour& colour, int style=wxSOLID);
-    ~wxBrush();
-
-    wxColour GetColour();
-    wxBitmap * GetStipple();
-    int GetStyle();
-    bool Ok();
-    void SetColour(wxColour &colour);
-    void SetStipple(wxBitmap& bitmap);
-    void SetStyle(int style);
-
-#ifdef __WXMAC__
-    short GetMacTheme();
-    void SetMacTheme(short macThemeBrush);
-#endif
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-
-class wxBrushList : public wxObject {
-public:
-
-    void AddBrush(wxBrush *brush);
-    wxBrush * FindOrCreateBrush(const wxColour& colour, int style);
-    void RemoveBrush(wxBrush *brush);
-
-    int GetCount();
-};
-
-//----------------------------------------------------------------------
-
-
-class wxDC : public wxObject {
-public:
-//    wxDC(); **** abstract base class, can't instantiate.
-    ~wxDC();
-
-    void BeginDrawing();
-
-//  %name(BlitXY)
-    bool Blit(wxCoord xdest, wxCoord ydest,
-              wxCoord width, wxCoord height,
-              wxDC *source, wxCoord xsrc, wxCoord ysrc,
-              int logicalFunc = wxCOPY, int useMask = FALSE);
-//      bool Blit(const wxPoint& destPt, const wxSize& sz,
-//                wxDC *source, const wxPoint& srcPt,
-//                int logicalFunc = wxCOPY, int useMask = FALSE);
-
-    void Clear();
-    void CrossHair(wxCoord x, wxCoord y);
-    void DestroyClippingRegion();
-    wxCoord DeviceToLogicalX(wxCoord x);
-    wxCoord DeviceToLogicalXRel(wxCoord x);
-    wxCoord DeviceToLogicalY(wxCoord y);
-    wxCoord DeviceToLogicalYRel(wxCoord y);
-    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc);
-    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius);
-    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxCoord start, wxCoord end);
-    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
-
-    void DrawLabel(const wxString& text, const wxRect& rect,
-                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                   int indexAccel = -1);
-
-    %addmethods {
-        wxRect DrawImageLabel(const wxString& text,
-                              const wxBitmap& image,
-                              const wxRect& rect,
-                              int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                              int indexAccel = -1) {
-            wxRect rv;
-            self->DrawLabel(text, image, rect, alignment, indexAccel, &rv);
-            return rv;
-        }
-    }
-
-    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-    void DrawLines(int PCOUNT, wxPoint* points, wxCoord xoffset=0, wxCoord yoffset=0);
-    void DrawPolygon(int PCOUNT, wxPoint* points, wxCoord xoffset=0, wxCoord yoffset=0,
-                     int fill_style=wxODDEVEN_RULE);
-    void DrawPoint(wxCoord x, wxCoord y);
-    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(DrawRectangleRect)void DrawRectangle(const wxRect& rect);
-    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
-    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxCoord radius=20);
-    void DrawSpline(int PCOUNT, wxPoint* points);
-    void DrawText(const wxString& text, wxCoord x, wxCoord y);
-    void EndDoc();
-    void EndDrawing();
-    void EndPage();
-    bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE);
-    wxBrush  GetBackground();
-    wxBrush  GetBrush();
-    wxCoord GetCharHeight();
-    wxCoord GetCharWidth();
-    void GetClippingBox(wxCoord *OUTPUT, wxCoord *OUTPUT,
-                        wxCoord *OUTPUT, wxCoord *OUTPUT);
-    wxFont GetFont();
-    int GetLogicalFunction();
-    void GetLogicalScale(double *OUTPUT, double *OUTPUT);
-    int GetMapMode();
-    bool GetOptimization();
-    wxPen GetPen();
-    %addmethods {
-        %new wxColour* GetPixel(wxCoord x, wxCoord y) {
-            wxColour* wc = new wxColour();
-            self->GetPixel(x, y, wc);
-            return wc;
-        }
-    }
-    %name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT);
-    wxSize GetSize();
-    wxSize GetSizeMM();
-    wxColour GetTextBackground();
-    void GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT);
-    %name(GetFullTextExtent)void GetTextExtent(const wxString& string,
-                       wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,
-                       const wxFont* font = NULL);
-    void GetMultiLineTextExtent(const wxString& text, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
-                                wxFont *font = NULL);
-    wxColour GetTextForeground();
-    void GetUserScale(double *OUTPUT, double *OUTPUT);
-    wxCoord LogicalToDeviceX(wxCoord x);
-    wxCoord LogicalToDeviceXRel(wxCoord x);
-    wxCoord LogicalToDeviceY(wxCoord y);
-    wxCoord LogicalToDeviceYRel(wxCoord y);
-    wxCoord MaxX();
-    wxCoord MaxY();
-    wxCoord MinX();
-    wxCoord MinY();
-    bool Ok();
-    void SetDeviceOrigin(wxCoord x, wxCoord y);
-    void SetBackground(const wxBrush& brush);
-    void SetBackgroundMode(int mode);
-    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
-    %name(SetClippingRect) void SetClippingRegion(const wxRect& rect);
-    void SetPalette(const wxPalette& colourMap);
-    void SetBrush(const wxBrush& brush);
-    void SetFont(const wxFont& font);
-    void SetLogicalFunction(int function);
-    void SetLogicalScale(double x, double y);
-    void SetMapMode(int mode);
-    void SetOptimization(bool optimize);
-    void SetPen(const wxPen& pen);
-    void SetTextBackground(const wxColour& colour);
-    void SetTextForeground(const wxColour& colour);
-    void SetUserScale(double x_scale, double y_scale);
-    bool StartDoc(const wxString& message);
-    void StartPage();
-
-
-
-    void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y,
-                    int useMask = FALSE);
-
-    bool CanDrawBitmap();
-    bool CanGetTextExtent();
-    int  GetDepth();
-    wxSize GetPPI();
-
-    void GetLogicalOrigin(int *OUTPUT, int *OUTPUT);
-    void SetLogicalOrigin(int x, int y);
-    void GetDeviceOrigin(int *OUTPUT, int *OUTPUT);
-    void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-
-    void CalcBoundingBox(int x, int y);
-    void ResetBoundingBox();
-
-    %addmethods {
-        void GetBoundingBox(int* OUTPUT, int* OUTPUT, int* OUTPUT, int* OUTPUT);
-        // See below for implementation
-    }
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-
-#ifdef __WXMSW__
-    long GetHDC();
-#endif
-
-
-    %addmethods {  // See drawlist.cpp for impplementaion of these...
-
-        PyObject* _DrawPointList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
-        {
-            return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes);
-        }
-
-        PyObject* _DrawLineList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
-        {
-            return wxPyDrawXXXList(*self, wxPyDrawXXXLine, pyCoords, pyPens, pyBrushes);
-        }
-
-        PyObject* _DrawRectangleList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
-        {
-            return wxPyDrawXXXList(*self, wxPyDrawXXXRectangle, pyCoords, pyPens, pyBrushes);
-        }
-
-        PyObject* _DrawEllipseList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
-        {
-            return wxPyDrawXXXList(*self, wxPyDrawXXXEllipse, pyCoords, pyPens, pyBrushes);
-        }
-
-        PyObject* _DrawPolygonList(PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
-        {
-            return wxPyDrawXXXList(*self, wxPyDrawXXXPolygon, pyCoords, pyPens, pyBrushes);
-        }
-
-        PyObject* _DrawTextList(PyObject* textList, PyObject* pyPoints,
-                                PyObject* foregroundList, PyObject* backgroundList) {
-            return wxPyDrawTextList(*self, textList, pyPoints, foregroundList, backgroundList);
-        }
-    }
-
-    %pragma(python) addtoclass = "
-    def DrawPointList(self, points, pens=None):
-        if pens is None:
-           pens = []
-        elif isinstance(pens, wxPenPtr):
-           pens = [pens]
-        elif len(pens) != len(points):
-           raise ValueError('points and pens must have same length')
-        return self._DrawPointList(points, pens, [])
-
-
-    def DrawLineList(self, lines, pens=None):
-        if pens is None:
-           pens = []
-        elif isinstance(pens, wxPenPtr):
-           pens = [pens]
-        elif len(pens) != len(lines):
-           raise ValueError('lines and pens must have same length')
-        return self._DrawLineList(lines, pens, [])
-
-
-    def DrawRectangleList(self, rectangles, pens=None, brushes=None):
-        if pens is None:
-           pens = []
-        elif isinstance(pens, wxPenPtr):
-           pens = [pens]
-        elif len(pens) != len(rectangles):
-           raise ValueError('rectangles and pens must have same length')
-        if brushes is None:
-           brushes = []
-        elif isinstance(brushes, wxBrushPtr):
-           brushes = [brushes]
-        elif len(brushes) != len(rectangles):
-           raise ValueError('rectangles and brushes must have same length')
-        return self._DrawRectangleList(rectangles, pens, brushes)
-
-
-    def DrawEllipseList(self, ellipses, pens=None, brushes=None):
-        if pens is None:
-           pens = []
-        elif isinstance(pens, wxPenPtr):
-           pens = [pens]
-        elif len(pens) != len(ellipses):
-           raise ValueError('ellipses and pens must have same length')
-        if brushes is None:
-           brushes = []
-        elif isinstance(brushes, wxBrushPtr):
-           brushes = [brushes]
-        elif len(brushes) != len(ellipses):
-           raise ValueError('ellipses and brushes must have same length')
-        return self._DrawEllipseList(ellipses, pens, brushes)
-
-
-    def DrawPolygonList(self, polygons, pens=None, brushes=None):
-        ## Note: This does not currently support fill style or offset
-        ## you can always use the non-List version if need be.
-        ## I really would like to support fill-style, however,
-        ## but wxODDEVEN_RULE does not appear to be defined at the Python level
-        ## [It's in wx.py... --Robin]
-        if pens is None:
-           pens = []
-        elif isinstance(pens, wxPenPtr):
-           pens = [pens]
-        elif len(pens) != len(polygons):
-           raise ValueError('polygons and pens must have same length')
-        if brushes is None:
-           brushes = []
-        elif isinstance(brushes, wxBrushPtr):
-           brushes = [brushes]
-        elif len(brushes) != len(polygons):
-           raise ValueError('polygons and brushes must have same length')
-        return self._DrawPolygonList(polygons, pens, brushes)
-
-
-    def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
-        ## NOTE: this does not currently support changing the font
-        ##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
-        ##       If you want backgounds to do anything.
-        if type(textList) == type(''):
-           textList = [textList]
-        elif len(textList) != len(coords):
-           raise ValueError('textlist and coords must have same length')
-        if foregrounds is None:
-           foregrounds = []
-        elif isinstance(foregrounds, wxColourPtr):
-           foregrounds = [foregrounds]
-        elif len(foregrounds) != len(coords):
-           raise ValueError('foregrounds and coords must have same length')
-        if backgrounds is None:
-           backgrounds = []
-        elif isinstance(backgrounds, wxColourPtr):
-           backgrounds = [backgrounds]
-        elif len(backgrounds) != len(coords):
-           raise ValueError('backgrounds and coords must have same length')
-        return  self._DrawTextList(textList, coords, foregrounds, backgrounds)
-"
-
-
-};
-
-
-
-%{
-static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) {
-    *x1 = dc->MinX();
-    *y1 = dc->MinY();
-    *x2 = dc->MaxX();
-    *y2 = dc->MaxY();
-}
-%}
-
-//----------------------------------------------------------------------
-
-class wxMemoryDC : public wxDC {
-public:
-    wxMemoryDC();
-
-    void SelectObject(const wxBitmap& bitmap);
-}
-
-%new wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC);
-%{                                      // Alternate 'constructor'
-    wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC) {
-        return new wxMemoryDC(oldDC);
-    }
-%}
-
-
-//---------------------------------------------------------------------------
-
-class wxBufferedDC : public wxMemoryDC {
-public:
-        // Construct a wxBufferedDC using a user supplied buffer.
-    wxBufferedDC( wxDC *dc, const wxBitmap &buffer );
-
-        // Construct a wxBufferedDC with an internal buffer of 'area'
-        // (where area is usually something like the size of the window
-        // being buffered)
-    %name(wxBufferedDCInternalBuffer)wxBufferedDC( wxDC *dc, const wxSize &area );
-
-        // Blits the buffer to the dc, and detaches the dc from
-        // the buffer.  Usually called in the dtor or by the dtor
-        // of derived classes if the BufferedDC must blit before
-        // the derived class (which may own the dc it's blitting
-        // to) is destroyed.
-    void UnMask();
-
-
-    %pragma(python) addtomethod =
-        "__init__:self._dc = _args[0] # save a ref so the other dc won't be deleted before self"
-    %pragma(python) addtomethod =
-        "wxBufferedDCInternalBuffer:val._dc = _args[0] # save a ref so the other dc won't be deleted before self"
-};
-
-
-class wxBufferedPaintDC : public wxBufferedDC
-{
-public:
-    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );
-};
-
-//---------------------------------------------------------------------------
-
-class wxScreenDC : public wxDC {
-public:
-    wxScreenDC();
-
-    %name(StartDrawingOnTopWin) bool StartDrawingOnTop(wxWindow* window);
-    bool StartDrawingOnTop(wxRect* rect = NULL);
-    bool EndDrawingOnTop();
-};
-
-//---------------------------------------------------------------------------
-
-class wxClientDC : public wxDC {
-public:
-      wxClientDC(wxWindow* win);
-};
-
-//---------------------------------------------------------------------------
-
-class wxPaintDC : public wxDC {
-public:
-      wxPaintDC(wxWindow* win);
-};
-
-//---------------------------------------------------------------------------
-
-class wxWindowDC : public wxDC {
-public:
-      wxWindowDC(wxWindow* win);
-};
-
-//---------------------------------------------------------------------------
-
-class wxMirrorDC : public wxDC
-{
-public:
-    // constructs a mirror DC associated with the given real DC
-    //
-    // if mirror parameter is true, all vertical and horizontal coordinates are
-    // exchanged, otherwise this class behaves in exactly the same way as a
-    // plain DC
-    //
-    wxMirrorDC(wxDC& dc, bool mirror);
-};
-
-//---------------------------------------------------------------------------
-
-
-#ifdef __WXMSW__
-
-%{
-#include <wx/metafile.h>
-%}
-
-class wxMetaFile : public wxObject {
-public:
-    wxMetaFile(const wxString& filename = wxPyEmptyString);
-    ~wxMetaFile();
-
-    bool Ok();
-    bool SetClipboard(int width = 0, int height = 0);
-
-    wxSize GetSize();
-    int GetWidth();
-    int GetHeight();
-
-    const wxString& GetFileName() const { return m_filename; }
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-// bool wxMakeMetaFilePlaceable(const wxString& filename,
-//                              int minX, int minY, int maxX, int maxY, float scale=1.0);
-
-
-class wxMetaFileDC : public wxDC {
-public:
-    wxMetaFileDC(const wxString& filename = wxPyEmptyString,
-                 int width = 0, int height = 0,
-                 const wxString& description = wxPyEmptyString);
-    wxMetaFile* Close();
-};
-
-#endif
-
-//---------------------------------------------------------------------------
-
-class wxPalette : public wxGDIObject {
-public:
-    wxPalette(int LCOUNT, byte* choices, byte* choices, byte* choices);
-    ~wxPalette();
-
-    int GetPixel(byte red, byte green, byte blue);
-    bool GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT);
-    bool Ok();
-
-    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"
-};
-
-//---------------------------------------------------------------------------
-
-enum {
-    wxIMAGELIST_DRAW_NORMAL ,
-    wxIMAGELIST_DRAW_TRANSPARENT,
-    wxIMAGELIST_DRAW_SELECTED,
-    wxIMAGELIST_DRAW_FOCUSED,
-    wxIMAGE_LIST_NORMAL,
-    wxIMAGE_LIST_SMALL,
-    wxIMAGE_LIST_STATE
-};
-
-class wxImageList : public wxObject {
-public:
-    wxImageList(int width, int height, int mask=TRUE, int initialCount=1);
-    ~wxImageList();
-
-    int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
-    %name(AddWithColourMask)int Add(const wxBitmap& bitmap, const wxColour& maskColour);
-    %name(AddIcon)int Add(const wxIcon& icon);
-#ifdef __WXMSW__
-    bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
-#else
-//      %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon);
-//      int Add(const wxBitmap& bitmap);
-    bool Replace(int index, const wxBitmap& bitmap);
-#endif
-
-    bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL,
-              const bool solidBackground = FALSE);
-
-    int GetImageCount();
-    bool Remove(int index);
-    bool RemoveAll();
-    void GetSize(int index, int& OUTPUT, int& OUTPUT);
-};
-
-
 //---------------------------------------------------------------------------
-// Regions, etc.
-
-enum wxRegionContain {
-	wxOutRegion, wxPartRegion, wxInRegion
-};
-
-
-class wxRegion : public wxGDIObject {
-public:
-    wxRegion(wxCoord x=0, wxCoord y=0, wxCoord width=0, wxCoord height=0);
-#ifndef __WXMAC__
-    %name(wxRegionFromPoints)wxRegion(int PCOUNT, wxPoint* points, int fillStyle = wxWINDING_RULE);
-#endif
-    %name(wxRegionFromBitmap)wxRegion(const wxBitmap& bmp,
-                                      const wxColour& transColour = wxNullColour,
-                                      int   tolerance = 0);
-    ~wxRegion();
-
-
-    void Clear();
-#ifndef __WXMAC__
-    bool Offset(wxCoord x, wxCoord y);
-#endif
-
-    wxRegionContain Contains(wxCoord x, wxCoord y);
-    %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
-    %name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
-    %name(ContainsRectDim)wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-
-    wxRect GetBox();
-
-    bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(IntersectRect)bool Intersect(const wxRect& rect);
-    %name(IntersectRegion)bool Intersect(const wxRegion& region);
-
-    bool IsEmpty();
-
-    bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(UnionRect)bool Union(const wxRect& rect);
-    %name(UnionRegion)bool Union(const wxRegion& region);
-
-    bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(SubtractRect)bool Subtract(const wxRect& rect);
-    %name(SubtractRegion)bool Subtract(const wxRegion& region);
-
-    bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    %name(XorRect)bool Xor(const wxRect& rect);
-    %name(XorRegion)bool Xor(const wxRegion& region);
-
-    // Convert the region to a B&W bitmap with the white pixels being inside
-    // the region.
-    wxBitmap ConvertToBitmap();
-
-    // Use the non-transparent pixels of a wxBitmap for the region to combine
-    // with this region.  If the bitmap has a mask then it will be used,
-    // otherwise the colour to be treated as transparent may be specified,
-    // along with an optional tolerance value.
-    %name(UnionBitmap)bool Union(const wxBitmap& bmp,
-                                 const wxColour& transColour = wxNullColour,
-                                 int   tolerance = 0);
-};
-
-
-
-class wxRegionIterator : public wxObject {
-public:
-    wxRegionIterator(const wxRegion& region);
-    ~wxRegionIterator();
-
-    wxCoord GetX();
-    wxCoord GetY();
-    wxCoord GetW();
-    wxCoord GetWidth();
-    wxCoord GetH();
-    wxCoord GetHeight();
-    wxRect GetRect();
-    bool HaveRects();
-    void Reset();
-
-    %addmethods {
-        void Next() {
-            (*self) ++;
-        }
-    };
-};
-
-
-//---------------------------------------------------------------------------
-
-
-%readonly
-%{
-#if 0
-%}
-
-// See also wxPy_ReinitStockObjects in helpers.cpp
-
-extern wxFont *wxNORMAL_FONT;
-extern wxFont *wxSMALL_FONT;
-extern wxFont *wxITALIC_FONT;
-extern wxFont *wxSWISS_FONT;
-
-extern wxPen *wxRED_PEN;
-extern wxPen *wxCYAN_PEN;
-extern wxPen *wxGREEN_PEN;
-extern wxPen *wxBLACK_PEN;
-extern wxPen *wxWHITE_PEN;
-extern wxPen *wxTRANSPARENT_PEN;
-extern wxPen *wxBLACK_DASHED_PEN;
-extern wxPen *wxGREY_PEN;
-extern wxPen *wxMEDIUM_GREY_PEN;
-extern wxPen *wxLIGHT_GREY_PEN;
-
-extern wxBrush *wxBLUE_BRUSH;
-extern wxBrush *wxGREEN_BRUSH;
-extern wxBrush *wxWHITE_BRUSH;
-extern wxBrush *wxBLACK_BRUSH;
-extern wxBrush *wxTRANSPARENT_BRUSH;
-extern wxBrush *wxCYAN_BRUSH;
-extern wxBrush *wxRED_BRUSH;
-extern wxBrush *wxGREY_BRUSH;
-extern wxBrush *wxMEDIUM_GREY_BRUSH;
-extern wxBrush *wxLIGHT_GREY_BRUSH;
-
-extern wxColour *wxBLACK;
-extern wxColour *wxWHITE;
-extern wxColour *wxRED;
-extern wxColour *wxBLUE;
-extern wxColour *wxGREEN;
-extern wxColour *wxCYAN;
-extern wxColour *wxLIGHT_GREY;
-
-extern wxCursor *wxSTANDARD_CURSOR;
-extern wxCursor *wxHOURGLASS_CURSOR;
-extern wxCursor *wxCROSS_CURSOR;
-
-
-extern wxBitmap wxNullBitmap;
-extern wxIcon   wxNullIcon;
-extern wxCursor wxNullCursor;
-extern wxPen    wxNullPen;
-extern wxBrush  wxNullBrush;
-extern wxPalette wxNullPalette;
-extern wxFont   wxNullFont;
-extern wxColour wxNullColour;
-
-
-extern wxFontList*       wxTheFontList;
-extern wxPenList*        wxThePenList;
-extern wxBrushList*      wxTheBrushList;
-extern wxColourDatabase* wxTheColourDatabase;
-
-
-%readwrite
-%{
-#endif
-%}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-