%{
#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>
%}
//----------------------------------------------------------------------
%import _defs.i
%import misc.i
-
%{
static wxString wxPyEmptyStr("");
%}
//---------------------------------------------------------------------------
-// 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
+class wxBitmap : public wxGDIObject
{
public:
- wxBitmap(const wxString& name, long type);
+ wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_BMP);
~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_BMP);
+ bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL);
void SetMask(wxMask* mask);
#ifdef __WXMSW__
void SetPalette(wxPalette& palette);
#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);
%new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1);
%new wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings);
%new wxBitmap* wxBitmapFromIcon(const wxIcon& icon);
+%new wxBitmap* wxBitmapFromBits(char* 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
return cArray;
}
+
wxBitmap* wxBitmapFromXPMData(PyObject* listOfStrings) {
char** cArray = NULL;
wxBitmap* bmp;
}
-#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);
+ wxBitmap* wxBitmapFromBits(char* bits, int width, int height, int depth = 1 ) {
+ return new wxBitmap(bits, width, height, depth);
}
-#endif
+
+
+// #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();
//---------------------------------------------------------------------------
-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__
//---------------------------------------------------------------------------
-class wxCursor
-//: public wxGDIImage
+class wxCursor : public wxGDIObject
{
public:
#ifdef __WXMSW__
//----------------------------------------------------------------------
+enum wxFontFamily
+{
+ wxFONTFAMILY_DEFAULT = wxDEFAULT,
+ wxFONTFAMILY_DECORATIVE = wxDECORATIVE,
+ wxFONTFAMILY_ROMAN = wxROMAN,
+ wxFONTFAMILY_SCRIPT = wxSCRIPT,
+ wxFONTFAMILY_SWISS = wxSWISS,
+ wxFONTFAMILY_MODERN = wxMODERN,
+ wxFONTFAMILY_TELETYPE = wxTELETYPE,
+ wxFONTFAMILY_MAX
+};
+
+// font styles
+enum wxFontStyle
+{
+ wxFONTSTYLE_NORMAL = wxNORMAL,
+ wxFONTSTYLE_ITALIC = wxITALIC,
+ wxFONTSTYLE_SLANT = wxSLANT,
+ wxFONTSTYLE_MAX
+};
+
+// font weights
+enum wxFontWeight
+{
+ wxFONTWEIGHT_NORMAL = wxNORMAL,
+ wxFONTWEIGHT_LIGHT = wxLIGHT,
+ wxFONTWEIGHT_BOLD = wxBOLD,
+ wxFONTWEIGHT_MAX
+};
+
+
+// font encodings
enum wxFontEncoding
{
wxFONTENCODING_SYSTEM = -1, // system default
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_4, // Baltic (old) (Latin4)
wxFONTENCODING_ISO8859_5, // Cyrillic
wxFONTENCODING_ISO8859_6, // Arabic
wxFONTENCODING_ISO8859_7, // Greek
wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it
// here anyhow to make all ISO8859
// consecutive numbers
- wxFONTENCODING_ISO8859_13, // Latin7
+ wxFONTENCODING_ISO8859_13, // Baltic (Latin7)
wxFONTENCODING_ISO8859_14, // Latin8
wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro)
+ wxFONTENCODING_ISO8859_MAX,
// Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
wxFONTENCODING_KOI8, // we don't support any of KOI8 variants
wxFONTENCODING_CP855, // another cyrillic encoding
wxFONTENCODING_CP866, // and another one
// and for Windows
+ wxFONTENCODING_CP874, // WinThai
+ wxFONTENCODING_CP932, // Japanese (shift-JIS)
+ wxFONTENCODING_CP936, // Chiniese simplified (GB)
+ wxFONTENCODING_CP949, // Korean (Hangul charset)
+ wxFONTENCODING_CP950, // Chinese (traditional - Big5)
wxFONTENCODING_CP1250, // WinLatin2
wxFONTENCODING_CP1251, // WinCyrillic
wxFONTENCODING_CP1252, // WinLatin1
+ wxFONTENCODING_CP1253, // WinGreek (8859-7)
+ wxFONTENCODING_CP1254, // WinTurkish
+ wxFONTENCODING_CP1255, // WinHebrew
+ wxFONTENCODING_CP1256, // WinArabic
+ wxFONTENCODING_CP1257, // WinBaltic (same as Latin 7)
+ wxFONTENCODING_CP12_MAX,
+
+ wxFONTENCODING_UTF7, // UTF-7 Unicode encoding
+ wxFONTENCODING_UTF8, // UTF-8 Unicode encoding
+
+ wxFONTENCODING_UNICODE, // Unicode - currently used only by
+ // wxEncodingConverter class
wxFONTENCODING_MAX
};
-class wxFont {
+
+// wxNativeFontInfo is platform-specific font representation: this struct
+// should be considered as opaque font description only used by the native
+// functions, the user code can only get the objects of this type from
+// somewhere and pass it somewhere else (possibly save them somewhere using
+// ToString() and restore them using FromString())
+struct wxNativeFontInfo
+{
+#ifdef __WXGTK__
+ // init the elements from an XLFD, return TRUE if ok
+ bool FromXFontName(const wxString& xFontName);
+
+ // generate an XLFD using the fontElements
+ wxString GetXFontName() const;
+#endif
+
+ wxNativeFontInfo() { Init(); }
+
+ // reset to the default state
+ void Init();
+
+#ifndef __WXGTK__
+ // accessors and modifiers for the font elements
+ int GetPointSize() const;
+ wxFontStyle GetStyle() const;
+ wxFontWeight GetWeight() const;
+ bool GetUnderlined() const;
+ wxString GetFaceName() const;
+ wxFontFamily GetFamily() const;
+ wxFontEncoding GetEncoding() const;
+
+ void SetPointSize(int pointsize);
+ void SetStyle(wxFontStyle style);
+ void SetWeight(wxFontWeight weight);
+ void SetUnderlined(bool underlined);
+ void SetFaceName(wxString facename);
+ void SetFamily(wxFontFamily family);
+ void SetEncoding(wxFontEncoding encoding);
+#endif
+
+ // it is important to be able to serialize wxNativeFontInfo objects to be
+ // able to store them (in config file, for example)
+ bool FromString(const wxString& s);
+ wxString ToString() const;
+
+ %addmethods {
+ wxString __str__() {
+ return self->ToString();
+ }
+ }
+
+ // we also want to present the native font descriptions to the user in some
+ // human-readable form (it is not platform independent neither, but can
+ // hopefully be understood by the user)
+ bool FromUserString(const wxString& s);
+ wxString ToUserString() const;
+};
+
+
+// wxFontMapper manages user-definable correspondence between logical font
+// names and the fonts present on the machine.
+//
+// The default implementations of all functions will ask the user if they are
+// not capable of finding the answer themselves and store the answer in a
+// config file (configurable via SetConfigXXX functions). This behaviour may
+// be disabled by giving the value of FALSE to "interactive" parameter.
+// However, the functions will always consult the config file to allow the
+// user-defined values override the default logic and there is no way to
+// disable this - which shouldn't be ever needed because if "interactive" was
+// never TRUE, the config file is never created anyhow.
+class wxFontMapper
+{
+public:
+ wxFontMapper();
+ ~wxFontMapper();
+
+
+ // find an alternative for the given encoding (which is supposed to not be
+ // available on this system). If successful, return TRUE and rwxFontEcoding
+ // that can be used it wxFont ctor otherwise return FALSE
+ //bool GetAltForEncoding(wxFontEncoding encoding,
+ // wxFontEncoding *alt_encoding,
+ // const wxString& facename = wxEmptyString,
+ // bool interactive = TRUE);
+
+
+ // Find an alternative for the given encoding (which is supposed to not be
+ // available on this system). If successful, returns the encoding otherwise
+ // returns None.
+ %addmethods {
+ PyObject* GetAltForEncoding(wxFontEncoding encoding,
+ const wxString& facename = wxEmptyString,
+ bool interactive = TRUE) {
+ wxFontEncoding alt_enc;
+ if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive))
+ return PyInt_FromLong(alt_enc);
+ else {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ }
+ }
+
+
+ // checks whether given encoding is available in given face or not.
+ // If no facename is given,
+ bool IsEncodingAvailable(wxFontEncoding encoding,
+ const wxString& facename = wxEmptyString);
+
+ // returns the encoding for the given charset (in the form of RFC 2046) or
+ // wxFONTENCODING_SYSTEM if couldn't decode it
+ wxFontEncoding CharsetToEncoding(const wxString& charset,
+ bool interactive = TRUE);
+
+ // return internal string identifier for the encoding (see also
+ // GetEncodingDescription())
+ static wxString GetEncodingName(wxFontEncoding encoding);
+
+ // return user-readable string describing the given encoding
+ //
+ // NB: hard-coded now, but might change later (read it from config?)
+ static wxString GetEncodingDescription(wxFontEncoding encoding);
+
+ // the parent window for modal dialogs
+ void SetDialogParent(wxWindow *parent);
+
+ // the title for the dialogs (note that default is quite reasonable)
+ void SetDialogTitle(const wxString& title);
+
+ // functions which allow to configure the config object used: by default,
+ // the global one (from wxConfigBase::Get() will be used) and the default
+ // root path for the config settings is the string returned by
+ // GetDefaultConfigPath()
+
+
+ // set the config object to use (may be NULL to use default)
+ void SetConfig(wxConfigBase *config);
+
+ // set the root config path to use (should be an absolute path)
+ void SetConfigPath(const wxString& prefix);
+
+ // return default config path
+ static const wxChar *GetDefaultConfigPath();
+};
+
+
+
+
+class wxFont : public wxGDIObject {
public:
wxFont( int pointSize, int family, int style, int weight,
int underline=FALSE, char* faceName = "",
wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
+
+ %name(wxFontFromNativeInfo)wxFont(const wxNativeFontInfo& info);
+
~wxFont();
- 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);
+ bool Ok() const;
+ int GetPointSize() const;
+ int GetFamily() const;
+ int GetStyle() const;
+ int GetWeight() const;
+ bool GetUnderlined() const;
+ wxString GetFaceName() const;
+ wxFontEncoding GetEncoding() const;
+ wxNativeFontInfo* GetNativeFontInfo() const;
+ wxString GetNativeFontInfoDesc() const;
+ wxString GetNativeFontInfoUserDesc() const;
+
void SetPointSize(int pointSize);
+ void SetFamily(int family);
void SetStyle(int style);
- void SetUnderlined(bool underlined);
void SetWeight(int weight);
+ void SetFaceName(const wxString& faceName);
+ void SetUnderlined(bool underlined);
void SetEncoding(wxFontEncoding encoding);
- wxString GetFamilyString();
- wxString GetStyleString();
- wxString GetWeightString();
-};
+ void SetNativeFontInfo(const wxNativeFontInfo& info);
+ // void SetNativeFontInfo(const wxString& info);
+ void SetNativeFontInfoUserDesc(const wxString& info);
-%inline %{
- wxFontEncoding wxFont_GetDefaultEncoding() {
- return wxFont::GetDefaultEncoding();
- }
+ wxString GetFamilyString() const;
+ wxString GetStyleString() const;
+ wxString GetWeightString() const;
- void wxFont_SetDefaultEncoding(wxFontEncoding encoding) {
- wxFont::SetDefaultEncoding(encoding);
- }
-%}
+ static wxFontEncoding GetDefaultEncoding();
+ static void SetDefaultEncoding(wxFontEncoding encoding);
+
+};
-class wxFontList {
+class wxFontList : public wxObject {
public:
void AddFont(wxFont* font);
bool underline = FALSE, const char* facename = NULL,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
void RemoveFont(wxFont *font);
+
+ int GetCount();
};
//----------------------------------------------------------------------
-class wxColour {
+class wxColour : public wxObject {
public:
wxColour(unsigned char red=0, unsigned char green=0, unsigned char blue=0);
~wxColour();
-class wxColourDatabase {
+class wxColourDatabase : public wxObject {
public:
wxColour *FindColour(const wxString& colour);
//----------------------------------------------------------------------
-
-class wxPen {
+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 SetWidth(int width);
// **** This one needs to return a list of ints (wxDash)
- int GetDashes(wxDash **dashes);
+ //int GetDashes(wxDash **dashes);
void SetDashes(int LCOUNT, wxDash* choices);
#ifdef __WXMSW__
};
-class wxPenList {
+
+
+// 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 {
+class wxBrush : public wxGDIObject {
public:
wxBrush(const wxColour& colour, int style=wxSOLID);
~wxBrush();
- wxColour& GetColour();
+ wxColour GetColour();
wxBitmap * GetStipple();
int GetStyle();
bool Ok();
};
-class wxBrushList {
+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 EndDrawing();
void EndPage();
void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE);
- wxBrush& GetBackground();
- wxBrush& GetBrush();
+ wxBrush GetBackground();
+ wxBrush GetBrush();
long GetCharHeight();
long GetCharWidth();
void GetClippingBox(long *OUTPUT, long *OUTPUT,
long *OUTPUT, long *OUTPUT);
- wxFont& GetFont();
+ 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) {
wxColour* wc = new wxColour();
%name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT);
wxSize GetSize();
wxSize GetSizeMM();
- wxColour& GetTextBackground();
+ wxColour GetTextBackground();
void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT);
%name(GetFullTextExtent)void GetTextExtent(const wxString& string,
long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT,
const wxFont* font = NULL);
- wxColour& GetTextForeground();
+ wxColour GetTextForeground();
void GetUserScale(double *OUTPUT, double *OUTPUT);
long LogicalToDeviceX(long x);
long LogicalToDeviceXRel(long x);
void SetBackground(const wxBrush& brush);
void SetBackgroundMode(int mode);
void SetClippingRegion(long x, long y, long width, long height);
+ %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region);
void SetPalette(const wxPalette& colourMap);
void SetBrush(const wxBrush& brush);
void SetFont(const wxFont& font);
void CalcBoundingBox(int x, int y);
void ResetBoundingBox();
+
+ %addmethods {
+ void GetBoundingBox(int* OUTPUT, int* OUTPUT, int* OUTPUT, int* OUTPUT);
+ // See below for implementation
+ }
+
+#ifdef __WXMSW__
+ long GetHDC();
+#endif
+
+
+ %addmethods {
+ // NOTE: These methods are VERY SIMILAR in implentation. It would be
+ // nice to factor out common code and or turn them into a set of
+ // template-like macros.
+
+ // Draw a point for every set of coordinants in pyPoints, optionally
+ // setting a new pen for each
+ PyObject* _DrawPointList(PyObject* pyPoints, PyObject* pyPens) {
+ bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
+ bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
+ int numObjs = 0;
+ int numPens = 0;
+ wxPen* pen;
+ PyObject* obj;
+ int x1, y1;
+ int i = 0;
+
+ if (!PySequence_Check(pyPoints)) {
+ goto err0;
+ }
+ if (!PySequence_Check(pyPens)) {
+ goto err1;
+ }
+ numObjs = PySequence_Length(pyPoints);
+ numPens = PySequence_Length(pyPens);
+
+ for (i = 0; i < numObjs; i++) {
+ // Use a new pen?
+ if (i < numPens) {
+ if (isFastPens) {
+ obj = PySequence_Fast_GET_ITEM(pyPens, i);
+ }
+ else {
+ obj = PySequence_GetItem(pyPens, i);
+ }
+ if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) {
+ if (!isFastPens)
+ Py_DECREF(obj);
+ goto err1;
+ }
+
+ self->SetPen(*pen);
+ if (!isFastPens)
+ Py_DECREF(obj);
+ }
+
+ // Get the point coordinants
+ if (isFastSeq) {
+ obj = PySequence_Fast_GET_ITEM(pyPoints, i);
+ }
+ else {
+ obj = PySequence_GetItem(pyPoints, i);
+ }
+ if (! _2int_seq_helper(obj, &x1, &y1)) {
+ if (!isFastPens)
+ Py_DECREF(obj);
+ goto err0;
+ }
+
+ // Now draw the point
+ self->DrawPoint(x1, y1);
+
+ if (!isFastSeq)
+ Py_DECREF(obj);
+ }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+
+ err1:
+ PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens");
+ return NULL;
+ err0:
+ PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences.");
+ return NULL;
+ }
+
+
+ // Draw a line for every set of coordinants in pyLines, optionally
+ // setting a new pen for each
+ PyObject* _DrawLineList(PyObject* pyLines, PyObject* pyPens) {
+ bool isFastSeq = PyList_Check(pyLines) || PyTuple_Check(pyLines);
+ bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
+ int numObjs = 0;
+ int numPens = 0;
+ wxPen* pen;
+ PyObject* obj;
+ int x1, y1, x2, y2;
+ int i = 0;
+
+ if (!PySequence_Check(pyLines)) {
+ goto err0;
+ }
+ if (!PySequence_Check(pyPens)) {
+ goto err1;
+ }
+ numObjs = PySequence_Length(pyLines);
+ numPens = PySequence_Length(pyPens);
+
+ for (i = 0; i < numObjs; i++) {
+ // Use a new pen?
+ if (i < numPens) {
+ if (isFastPens) {
+ obj = PySequence_Fast_GET_ITEM(pyPens, i);
+ }
+ else {
+ obj = PySequence_GetItem(pyPens, i);
+ }
+ if (SWIG_GetPtrObj(obj, (void **) &pen, "_wxPen_p")) {
+ if (!isFastPens)
+ Py_DECREF(obj);
+ goto err1;
+ }
+
+ self->SetPen(*pen);
+ if (!isFastPens)
+ Py_DECREF(obj);
+ }
+
+ // Get the line coordinants
+ if (isFastSeq) {
+ obj = PySequence_Fast_GET_ITEM(pyLines, i);
+ }
+ else {
+ obj = PySequence_GetItem(pyLines, i);
+ }
+ if (! _4int_seq_helper(obj, &x1, &y1, &x2, &y2)) {
+ if (!isFastPens)
+ Py_DECREF(obj);
+ goto err0;
+ }
+
+ // Now draw the line
+ self->DrawLine(x1, y1, x2, y2);
+
+ if (!isFastSeq)
+ Py_DECREF(obj);
+ }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+
+ err1:
+ PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens");
+ return NULL;
+ err0:
+ PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x2,y2) sequences.");
+ return NULL;
+ }
+ }
+
+
+ %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)
+"
+
+
};
+
+%{
+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 {
//---------------------------------------------------------------------------
-#ifndef __WXMSW__
-class wxPostScriptDC : public wxDC {
+
+#ifdef __WXMSW__
+
+%{
+#include <wx/metafile.h>
+%}
+
+class wxMetaFile : public wxObject {
public:
- wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow* win = NULL);
+ wxMetaFile(const wxString& filename = wxPyEmptyStr);
+ ~wxMetaFile();
+
+ bool Ok();
+ bool SetClipboard(int width = 0, int height = 0);
+
+ wxSize GetSize();
+ int GetWidth();
+ int GetHeight();
+
+ const wxString& GetFileName() const { return m_filename; }
+
};
-#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 = wxPyEmptyStr,
+ int width = 0, int height = 0,
+ const wxString& description = wxPyEmptyStr);
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();
+};
+
//---------------------------------------------------------------------------
+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(long x=0, long y=0, long width=0, long height=0);
+ ~wxRegion();
+
+ void Clear();
+ wxRegionContain Contains(long x, long y);
+ %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
+ %name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
+ %name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
+
+ wxRect GetBox();
+
+ bool Intersect(long x, long y, long width, long height);
+ %name(IntersectRect)bool Intersect(const wxRect& rect);
+ %name(IntersectRegion)bool Intersect(const wxRegion& region);
+
+ bool IsEmpty();
+
+ bool Union(long x, long y, long width, long height);
+ %name(UnionRect)bool Union(const wxRect& rect);
+ %name(UnionRegion)bool Union(const wxRegion& region);
+
+ bool Subtract(long x, long y, long width, long height);
+ %name(SubtractRect)bool Subtract(const wxRect& rect);
+ %name(SubtractRegion)bool Subtract(const wxRegion& region);
+
+ bool Xor(long x, long y, long width, long height);
+ %name(XorRect)bool Xor(const wxRect& rect);
+ %name(XorRegion)bool Xor(const wxRegion& region);
+};
+
+
+
+class wxRegionIterator : public wxObject {
+public:
+ wxRegionIterator(const wxRegion& region);
+ ~wxRegionIterator();
+
+ long GetX();
+ long GetY();
+ long GetW();
+ long GetWidth();
+ long GetH();
+ long GetHeight();
+ wxRect GetRect();
+ bool HaveRects();
+ void Reset();
+
+ %addmethods {
+ void Next() {
+ (*self) ++;
+ }
+ };
+};
+
+
+//---------------------------------------------------------------------------
%readonly
%{
#if 0
%}
+
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 wxFontList* wxTheFontList;
extern wxPenList* wxThePenList;
-extern wxBrushlist* wxTheBrushList;
+extern wxBrushList* wxTheBrushList;
extern wxColourDatabase* wxTheColourDatabase;
%}
//---------------------------------------------------------------------------
-
-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