%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();
wxPalette* GetPalette();
};
+// 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(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
+
+
+
+%{ // 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(char* bits, int width, int height, int depth = 1 ) {
+ return new wxBitmap(bits, 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,
#ifdef __WXMSW__
void SetSize(const wxSize& size);
#endif
+ void CopyFromBitmap(const wxBitmap& bmp);
+
%pragma(python) addtoclass = "
def __del__(self,gdic=gdic):
try:
except:
pass
"
-
};
+// Declarations of some alternate "constructors"
+%new wxIcon* wxEmptyIcon();
+%new wxIcon* wxIconFromXPMData(PyObject* listOfStrings);
+
+%{ // 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;
+ }
+%}
+
//---------------------------------------------------------------------------
-class wxCursor
-//: public wxGDIImage
+class wxCursor : public wxGDIObject
{
public:
#ifdef __WXMSW__
};
-class wxFont {
+class wxFont : public wxGDIObject {
public:
wxFont( int pointSize, int family, int style, int weight,
int underline=FALSE, char* faceName = "",
%}
-class wxFontList {
+class wxFontList : public wxObject {
public:
void AddFont(wxFont* font);
//----------------------------------------------------------------------
-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();
};
-class wxPenList {
+class wxPenList : public wxObject {
public:
void AddPen(wxPen* pen);
//----------------------------------------------------------------------
-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 wxDC {
+class wxDC : public wxObject {
public:
// wxDC(); **** abstract base class, can't instantiate.
~wxDC();
%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);
//---------------------------------------------------------------------------
-class wxPalette {
+class wxPalette : public wxGDIObject {
public:
wxPalette(int LCOUNT, byte* choices, byte* choices, byte* choices);
~wxPalette();
wxIMAGE_LIST_STATE
};
-class wxImageList {
+class wxImageList : public wxObject {
public:
wxImageList(int width, int height, int mask=TRUE, int initialCount=1);
~wxImageList();
};
+//---------------------------------------------------------------------------
+// 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) ++;
+ }
+ };
+};
+
+
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff