/////////////////////////////////////////////////////////////////////////////
// Name: gdi.i
-// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc.
+// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, etc.
//
// Author: Robin Dunn
//
%{
#include "helpers.h"
-#include <wx/metafile.h>
#include <wx/imaglist.h>
-#ifndef __WXMSW__
-#include <wx/dcps.h>
-#endif
+#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>
%}
//----------------------------------------------------------------------
// Import some definitions of other classes, etc.
%import _defs.i
%import misc.i
+%import fonts.i
+%pragma(python) code = "import wx"
+//---------------------------------------------------------------------------
%{
- static wxString wxPyEmptyStr("");
+ // Put some wx default wxChar* values into wxStrings.
+ static const wxString wxPyEmptyString(wxT(""));
%}
-
//---------------------------------------------------------------------------
-// class wxGDIImage {
-// public:
-// long GetHandle();
-// void SetHandle(long handle);
-// bool Ok();
-// int GetWidth();
-// int GetHeight();
-// int GetDepth();
-// void SetWidth(int w);
-// void SetHeight(int h);
-// void SetDepth(int d);
-// void SetSize(const wxSize& size);
-// };
+class wxGDIObject : public wxObject {
+public:
+ wxGDIObject();
+ ~wxGDIObject();
+
+ bool GetVisible();
+ void SetVisible( bool visible );
+
+ bool IsNull();
+
+};
//---------------------------------------------------------------------------
-class wxBitmap
-//: public wxGDIImage
+
+// 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, long type);
+ wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY);
~wxBitmap();
wxPalette* GetPalette();
wxMask* GetMask();
- bool LoadFile(const wxString& name, long flags);
- bool SaveFile(const wxString& name, int type, wxPalette* palette = NULL);
+ 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
#endif
wxBitmap GetSubBitmap( const wxRect& rect );
-#ifdef __WXMSW__
bool CopyFromIcon(const wxIcon& icon);
+#ifdef __WXMSW__
bool CopyFromCursor(const wxCursor& cursor);
int GetQuality();
void SetQuality(int q);
#endif
- %pragma(python) addtoclass = "
- def __del__(self,gdic=gdic):
- try:
- if self.thisown == 1 :
- gdic.delete_wxBitmap(self)
- except:
- pass
-"
+ %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
+// #ifdef __WXMSW__
+// %new wxBitmap* wxBitmapFromData(PyObject* data, long type,
+// int width, int height, int depth = 1);
+// #endif
+
+
+
+%{ // Implementations of some alternate "constructors"
-%{ // Alternate 'constructor'
wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) {
return new wxBitmap(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");
+ 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];
- return new wxBitmap((void*)PyString_AsString(data), type, width, height, depth);
+ 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;
}
-#endif
+
+
+ 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
%}
//---------------------------------------------------------------------------
-class wxMask {
+class wxMask : public wxObject {
public:
wxMask(const wxBitmap& bitmap);
//~wxMask();
+
+ %addmethods { void Destroy() { delete self; } }
};
%new wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour);
//---------------------------------------------------------------------------
-class wxIcon
-//: public wxGDIImage
+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__
#ifdef __WXMSW__
void SetSize(const wxSize& size);
#endif
- %pragma(python) addtoclass = "
- def __del__(self,gdic=gdic):
- try:
- if self.thisown == 1 :
- gdic.delete_wxIcon(self)
- except:
- pass
-"
+ 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;
+ }
+%}
+
+
//---------------------------------------------------------------------------
-class wxCursor
-//: public wxGDIImage
+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;
+
+ // set/get the icon file name
+ void SetFileName(const wxString& filename);
+ const wxString& GetFileName() const;
+
+ %addmethods {
+ void SetIndex(int num) {
+#ifdef __WXMSW__
+ self->SetIndex(num);
+#else
+ // do nothing
+#endif
+ }
+
+ int GetIndex() {
#ifdef __WXMSW__
- wxCursor(const wxString& cursorName, long flags, int hotSpotX=0, int hotSpotY=0);
+ return self->GetIndex();
+#else
+ return -1;
+#endif
+ }
+ }
+};
+
+
+
+//---------------------------------------------------------------------------
+
+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
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);
-%{ // Alternate 'constructor'
+%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);
}
-%}
-
-//----------------------------------------------------------------------
-
-enum wxFontEncoding
-{
- wxFONTENCODING_SYSTEM = -1, // system default
- wxFONTENCODING_DEFAULT, // current default encoding
-
- // ISO8859 standard defines a number of single-byte charsets
- wxFONTENCODING_ISO8859_1, // West European (Latin1)
- wxFONTENCODING_ISO8859_2, // Central and East European (Latin2)
- wxFONTENCODING_ISO8859_3, // Esperanto (Latin3)
- wxFONTENCODING_ISO8859_4, // Baltic languages (Estonian) (Latin4)
- wxFONTENCODING_ISO8859_5, // Cyrillic
- wxFONTENCODING_ISO8859_6, // Arabic
- wxFONTENCODING_ISO8859_7, // Greek
- wxFONTENCODING_ISO8859_8, // Hebrew
- wxFONTENCODING_ISO8859_9, // Turkish (Latin5)
- wxFONTENCODING_ISO8859_10, // Variation of Latin4 (Latin6)
- wxFONTENCODING_ISO8859_11, // Thai
- wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it
- // here anyhow to make all ISO8859
- // consecutive numbers
- wxFONTENCODING_ISO8859_13, // Latin7
- wxFONTENCODING_ISO8859_14, // Latin8
- wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro)
-
- // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
- wxFONTENCODING_KOI8, // we don't support any of KOI8 variants
- wxFONTENCODING_ALTERNATIVE, // same as MS-DOS CP866
- wxFONTENCODING_BULGARIAN, // used under Linux in Bulgaria
-
- // what would we do without Microsoft? They have their own encodings
- // for DOS
- wxFONTENCODING_CP437, // original MS-DOS codepage
- wxFONTENCODING_CP850, // CP437 merged with Latin1
- wxFONTENCODING_CP852, // CP437 merged with Latin2
- wxFONTENCODING_CP855, // another cyrillic encoding
- wxFONTENCODING_CP866, // and another one
- // and for Windows
- wxFONTENCODING_CP1250, // WinLatin2
- wxFONTENCODING_CP1251, // WinCyrillic
- wxFONTENCODING_CP1252, // WinLatin1
-
- wxFONTENCODING_MAX
-};
-
-class wxFont {
-public:
- // I'll do it this way to use long-lived objects and not have to
- // worry about when python may delete the object.
- %addmethods {
- wxFont( int pointSize, int family, int style, int weight,
- int underline=FALSE, char* faceName = "",
- wxFontEncoding encoding=wxFONTENCODING_DEFAULT) {
-
- return wxTheFontList->FindOrCreateFont(pointSize, family, style, weight,
- underline, faceName, encoding);
- }
- // NO Destructor.
+ wxCursor* wxCursorFromImage(const wxImage& image) {
+ return new wxCursor(image);
}
- bool Ok();
-
- wxString GetFaceName();
- int GetFamily();
-#ifdef __WXMSW__
- int GetFontId();
-#endif
- int GetPointSize();
- int GetStyle();
- bool GetUnderlined();
- int GetWeight();
- wxFontEncoding GetEncoding();
- void SetFaceName(const wxString& faceName);
- void SetFamily(int family);
- void SetPointSize(int pointSize);
- void SetStyle(int style);
- void SetUnderlined(bool underlined);
- void SetWeight(int weight);
- void SetEncoding(wxFontEncoding encoding);
- wxString GetFamilyString();
- wxString GetStyleString();
- wxString GetWeightString();
-};
-
-%inline %{
- wxFontEncoding wxFont_GetDefaultEncoding() {
- return wxFont::GetDefaultEncoding();
- }
-
- void wxFont_SetDefaultEncoding(wxFontEncoding encoding) {
- wxFont::SetDefaultEncoding(encoding);
+ 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 {
+class wxColour : public wxObject {
public:
wxColour(unsigned char red=0, unsigned char green=0, unsigned char blue=0);
~wxColour();
%addmethods {
PyObject* Get() {
PyObject* rv = PyTuple_New(3);
- PyTuple_SetItem(rv, 0, PyInt_FromLong(self->Red()));
- PyTuple_SetItem(rv, 1, PyInt_FromLong(self->Green()));
- PyTuple_SetItem(rv, 2, PyInt_FromLong(self->Blue()));
+ 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"
- %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
- %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+
+ %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)
+"
};
%}
-//----------------------------------------------------------------------
-
-class wxPen {
+class wxColourDatabase : public wxObject {
public:
- // I'll do it this way to use long-lived objects and not have to
- // worry about when python may delete the object.
+
+ wxColour *FindColour(const wxString& colour) ;
+ wxColour *FindColourNoAdd(const wxString& colour) const;
+ wxString FindName(const wxColour& colour) const;
+
%addmethods {
- wxPen(wxColour* colour, int width=1, int style=wxSOLID) {
- return wxThePenList->FindOrCreatePen(*colour, width, style);
+ 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);
}
- // NO Destructor.
}
+};
+
+
+//----------------------------------------------------------------------
+
+class wxPen : public wxGDIObject {
+public:
+ wxPen(wxColour& colour, int width=1, int style=wxSOLID);
+ ~wxPen();
int GetCap();
- wxColour& GetColour();
+ wxColour GetColour();
int GetJoin();
int GetStyle();
void SetStyle(int style);
void SetWidth(int width);
- // **** This one needs to return a list of ints (wxDash)
- int GetDashes(wxDash **dashes);
+
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()"
};
-//----------------------------------------------------------------------
-class wxBrush {
+
+
+// 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:
- // I'll do it this way to use long-lived objects and not have to
- // worry about when python may delete the object.
- %addmethods {
- wxBrush(const wxColour* colour, int style=wxSOLID) {
- return wxTheBrushList->FindOrCreateBrush(*colour, style);
+ 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];
}
- // NO Destructor.
+ wxPen::SetDashes(nb_dashes, m_dash);
}
-// wxBrush(const wxColour& colour, int style=wxSOLID);
+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();
+ 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 {
+
+class wxDC : public wxObject {
public:
// wxDC(); **** abstract base class, can't instantiate.
~wxDC();
void BeginDrawing();
+
// %name(BlitXY)
- bool Blit(long xdest, long ydest,
- long width, long height,
- wxDC *source, long xsrc, long ysrc,
+ 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(long x, long y);
+ void CrossHair(wxCoord x, wxCoord y);
void DestroyClippingRegion();
- long DeviceToLogicalX(long x);
- long DeviceToLogicalXRel(long x);
- long DeviceToLogicalY(long y);
- long DeviceToLogicalYRel(long y);
- void DrawArc(long x1, long y1, long x2, long y2, long xc, long yc);
- void DrawCircle(long x, long y, long radius);
- void DrawEllipse(long x, long y, long width, long height);
- void DrawEllipticArc(long x, long y, long width, long height, long start, long end);
- void DrawIcon(const wxIcon& icon, long x, long y);
- void DrawLine(long x1, long y1, long x2, long y2);
- void DrawLines(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0);
- void DrawPolygon(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0,
+ 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(long x, long y);
- void DrawRectangle(long x, long y, long width, long height);
+ 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(long x, long y, long width, long height, long radius=20);
+ void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxCoord radius=20);
void DrawSpline(int PCOUNT, wxPoint* points);
- void DrawText(const wxString& text, long x, long y);
+ void DrawText(const wxString& text, wxCoord x, wxCoord y);
void EndDoc();
void EndDrawing();
void EndPage();
- void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE);
- wxBrush& GetBackground();
- wxBrush& GetBrush();
- long GetCharHeight();
- long GetCharWidth();
- void GetClippingBox(long *OUTPUT, long *OUTPUT,
- long *OUTPUT, long *OUTPUT);
- wxFont& GetFont();
+ 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();
+ wxPen GetPen();
%addmethods {
- %new wxColour* GetPixel(long x, long y) {
+ %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, long *OUTPUT, long *OUTPUT);
+ wxColour GetTextBackground();
+ void GetTextExtent(const wxString& string, wxCoord *OUTPUT, wxCoord *OUTPUT);
%name(GetFullTextExtent)void GetTextExtent(const wxString& string,
- long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT,
+ wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord* OUTPUT,
const wxFont* font = NULL);
- wxColour& GetTextForeground();
+ void GetMultiLineTextExtent(const wxString& text, wxCoord *OUTPUT, wxCoord *OUTPUT, wxCoord *OUTPUT,
+ wxFont *font = NULL);
+ wxColour GetTextForeground();
void GetUserScale(double *OUTPUT, double *OUTPUT);
- long LogicalToDeviceX(long x);
- long LogicalToDeviceXRel(long x);
- long LogicalToDeviceY(long y);
- long LogicalToDeviceYRel(long y);
- long MaxX();
- long MaxY();
- long MinX();
- long MinY();
+ 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(long x, long y);
+ void SetDeviceOrigin(wxCoord x, wxCoord y);
void SetBackground(const wxBrush& brush);
void SetBackgroundMode(int mode);
- void SetClippingRegion(long x, long y, long width, long height);
+ 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 DrawBitmap(const wxBitmap& bitmap, long x, long y,
+ void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y,
int useMask = FALSE);
bool CanDrawBitmap();
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 {
%}
+//---------------------------------------------------------------------------
+
+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 {
//---------------------------------------------------------------------------
-#ifndef __WXMSW__
-class wxPostScriptDC : public wxDC {
+class wxMirrorDC : public wxDC
+{
public:
- wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow* win = NULL);
+ // 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);
};
-#endif
//---------------------------------------------------------------------------
+
#ifdef __WXMSW__
-class wxPrinterDC : public wxDC {
+
+%{
+#include <wx/metafile.h>
+%}
+
+class wxMetaFile : public wxObject {
public:
- wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output,
- bool interactive = TRUE, int orientation = wxPORTRAIT);
+ 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()"
};
-#endif
-//---------------------------------------------------------------------------
+// bool wxMakeMetaFilePlaceable(const wxString& filename,
+// int minX, int minY, int maxX, int maxY, float scale=1.0);
+
-#ifdef __WXMSW__
class wxMetaFileDC : public wxDC {
public:
- wxMetaFileDC(const wxString& filename = wxPyEmptyStr);
+ 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) ++;
+ }
+ };
+};
+
+
//---------------------------------------------------------------------------
%{
#if 0
%}
+
+// See also wxPy_ReinitStockObjects in helpers.cpp
+
extern wxFont *wxNORMAL_FONT;
extern wxFont *wxSMALL_FONT;
extern wxFont *wxITALIC_FONT;
extern wxCursor *wxHOURGLASS_CURSOR;
extern wxCursor *wxCROSS_CURSOR;
+
extern wxBitmap wxNullBitmap;
extern wxIcon wxNullIcon;
extern wxCursor wxNullCursor;
extern wxFont wxNullFont;
extern wxColour wxNullColour;
+
+extern wxFontList* wxTheFontList;
+extern wxPenList* wxThePenList;
+extern wxBrushList* wxTheBrushList;
+extern wxColourDatabase* wxTheColourDatabase;
+
+
%readwrite
%{
#endif
%}
//---------------------------------------------------------------------------
-
-class wxPalette {
-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();
-};
-
-//---------------------------------------------------------------------------
-
-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:
- 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);
-};
-
-
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff