X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b639c3c5ef53c4bdefd3b27aac1496787f024cb8..76784eecd960198bc54429a6e16d5bd7af458fce:/utils/wxPython/src/gdi.i diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index f4166abfb6..05a5de9351 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -16,6 +16,10 @@ %{ #include "helpers.h" #include +#include +#ifndef __WXMSW__ +#include +#endif %} //---------------------------------------------------------------------- @@ -49,7 +53,7 @@ public: void SetHeight(int height); void SetMask(wxMask* mask); #ifdef __WXMSW__ - void SetPalette(wxPalette* palette); + void SetPalette(wxPalette& palette); #endif void SetWidth(int width); }; @@ -62,9 +66,10 @@ wxBitmap* wxNoRefBitmap(char* name, long flags); return new wxBitmap(width, height, depth); } - // This one won't own the reference, so Python won't call - // the dtor, this is good for toolbars and such where - // the parent will manage the bitmap. + // This one won't own the reference, so Python + // won't call the dtor, this is good for + // toolbars and such where the parent will + // manage the bitmap. wxBitmap* wxNoRefBitmap(char* name, long flags) { return new wxBitmap(name, flags); } @@ -144,19 +149,19 @@ public: wxString GetFaceName(); int GetFamily(); +#ifdef __WXMSW__ int GetFontId(); +#endif int GetPointSize(); int GetStyle(); bool GetUnderlined(); int GetWeight(); -#ifdef __WXMSW__ 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); -#endif }; //---------------------------------------------------------------------- @@ -207,24 +212,23 @@ public: int GetCap(); wxColour& GetColour(); -#ifdef __WXMSW__ - // **** This one needs to return a list of ints (wxDash) - int GetDashes(wxDash **dashes); - wxBitmap* GetStipple(); -#endif int GetJoin(); int GetStyle(); int GetWidth(); bool Ok(); void SetCap(int cap_style); void SetColour(wxColour& colour); -#ifdef __WXMSW__ - void SetDashes(int LCOUNT, wxDash* LIST); - void SetStipple(wxBitmap * stipple); -#endif void SetJoin(int join_style); void SetStyle(int style); void SetWidth(int width); + +#ifdef __WXMSW__ + // **** This one needs to return a list of ints (wxDash) + int GetDashes(wxDash **dashes); + wxBitmap* GetStipple(); + void SetDashes(int LCOUNT, wxDash* LIST); + void SetStipple(wxBitmap& stipple); +#endif }; //---------------------------------------------------------------------- @@ -244,11 +248,9 @@ public: wxBitmap * GetStipple(); int GetStyle(); bool Ok(); -#ifdef __WXMSW__ void SetColour(wxColour &colour); - void SetStipple(wxBitmap *bitmap); + void SetStipple(wxBitmap& bitmap); void SetStyle(int style); -#endif }; //---------------------------------------------------------------------- @@ -271,6 +273,7 @@ public: 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); @@ -286,23 +289,18 @@ public: void EndDoc(); void EndDrawing(); void EndPage(); -#ifdef __WXWIN__ void FloodFill(long x, long y, const wxColour& colour, int style=wxFLOOD_SURFACE); -#endif -#ifdef __WXGTK__ - void FloodFill(long x, long y, wxColour* colour, int style=wxFLOOD_SURFACE); -#endif - 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(); int GetMapMode(); bool GetOptimization(); - wxPen * GetPen(); + wxPen& GetPen(); %addmethods { %new wxColour* GetPixel(long x, long y) { wxColour* wc = new wxColour(); @@ -310,10 +308,13 @@ public: return wc; } } - void GetSize(int* OUTPUT, int* OUTPUT); //void GetSize(long* OUTPUT, long* OUTPUT); + %name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT); + wxSize GetSize(); wxColour& GetTextBackground(); - void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT, - long *OUTPUT, long *OUTPUT); + 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(); long LogicalToDeviceX(long x); long LogicalToDeviceXRel(long x); @@ -344,12 +345,12 @@ public: %addmethods { // This one is my own creation... - void DrawBitmap(wxBitmap* bitmap, long x, long y, bool swapPalette=TRUE) { + void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) { wxMemoryDC* memDC = new wxMemoryDC; memDC->SelectObject(bitmap); if (swapPalette) - self->SetPalette(bitmap->GetPalette()); - self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC, + self->SetPalette(*bitmap.GetPalette()); + self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC, 0, 0, self->GetLogicalFunction()); memDC->SelectObject(wxNullBitmap); delete memDC; @@ -402,12 +403,10 @@ public: //--------------------------------------------------------------------------- -#ifdef __WXMSW__ class wxWindowDC : public wxDC { public: wxWindowDC(wxWindow* win); }; -#endif //--------------------------------------------------------------------------- @@ -443,6 +442,9 @@ public: %readonly +%{ +#if 0 +%} extern wxFont *wxNORMAL_FONT; extern wxFont *wxSMALL_FONT; extern wxFont *wxITALIC_FONT; @@ -491,6 +493,11 @@ extern wxPalette wxNullPalette; extern wxFont wxNullFont; extern wxColour wxNullColour; +%readwrite +%{ +#endif +%} + //--------------------------------------------------------------------------- class wxPalette { @@ -505,39 +512,40 @@ public: //--------------------------------------------------------------------------- +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, const bool mask=TRUE, int initialCount=1); + ~wxImageList(); + +#ifdef __WXMSW__ + 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); + bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); + %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon); +#else + 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(); +}; + //--------------------------------------------------------------------------- -///////////////////////////////////////////////////////////////////////////// -// -// $Log$ -// Revision 1.6 1998/11/25 08:45:24 RD -// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon -// Added events for wxGrid -// Other various fixes and additions -// -// Revision 1.5 1998/10/20 06:43:57 RD -// New wxTreeCtrl wrappers (untested) -// some changes in helpers -// etc. -// -// Revision 1.4 1998/10/02 06:40:38 RD -// -// Version 0.4 of wxPython for MSW. -// -// Revision 1.3 1998/08/18 19:48:16 RD -// more wxGTK compatibility things. -// -// It builds now but there are serious runtime problems... -// -// Revision 1.2 1998/08/15 07:36:35 RD -// - Moved the header in the .i files out of the code that gets put into -// the .cpp files. It caused CVS conflicts because of the RCS ID being -// different each time. -// -// - A few minor fixes. -// -// Revision 1.1 1998/08/09 08:25:50 RD -// Initial version -// -//