From 5bff6bb8eace63d3841c1eb6d36230647c854f76 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 15 Dec 1999 19:46:19 +0000 Subject: [PATCH] Fixes for differences between wxMSW and wxGTK` git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/demo/GenericButtons.py | 20 +++--- utils/wxPython/src/gdi.i | 94 ++++++++++++++++++++------- utils/wxPython/src/my_typemaps.i | 6 +- utils/wxPython/src/stattool.i | 11 ++-- 4 files changed, 94 insertions(+), 37 deletions(-) diff --git a/utils/wxPython/demo/GenericButtons.py b/utils/wxPython/demo/GenericButtons.py index b67a00acde..dd74c531fb 100644 --- a/utils/wxPython/demo/GenericButtons.py +++ b/utils/wxPython/demo/GenericButtons.py @@ -41,12 +41,14 @@ class TestPanel(wxPanel): b = wxGenBitmapButton(self, -1, None, (100, 130)) EVT_BUTTON(self, b.GetId(), self.OnButton) bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP) - mask = wxMaskColour(bmp, wxBLUE) - bmp.SetMask(mask) + if wxPlatform == '__WXMSW__': + mask = wxMaskColour(bmp, wxBLUE) + bmp.SetMask(mask) b.SetBitmapLabel(bmp) bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP) - mask = wxMaskColour(bmp, wxBLUE) - bmp.SetMask(mask) + if wxPlatform == '__WXMSW__': + mask = wxMaskColour(bmp, wxBLUE) + bmp.SetMask(mask) b.SetBitmapSelected(bmp) b.SetBestSize() @@ -57,12 +59,14 @@ class TestPanel(wxPanel): b = wxGenBitmapToggleButton(self, -1, None, (100, 230)) EVT_BUTTON(self, b.GetId(), self.OnToggleButton) bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP) - mask = wxMaskColour(bmp, wxBLUE) - bmp.SetMask(mask) + if wxPlatform == '__WXMSW__': + mask = wxMaskColour(bmp, wxBLUE) + bmp.SetMask(mask) b.SetBitmapLabel(bmp) bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP) - mask = wxMaskColour(bmp, wxBLUE) - bmp.SetMask(mask) + if wxPlatform == '__WXMSW__': + mask = wxMaskColour(bmp, wxBLUE) + bmp.SetMask(mask) b.SetBitmapSelected(bmp) b.SetToggle(true) b.SetBestSize() diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index 4d8ed63f08..3a7eee039f 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -33,28 +33,25 @@ //--------------------------------------------------------------------------- -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 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 wxBitmap : public wxGDIImage { +class wxBitmap +//: public wxGDIImage +{ public: wxBitmap(const wxString& name, long type); ~wxBitmap(); @@ -67,8 +64,25 @@ public: #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 }; + %new wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1); #ifdef __WXMSW__ @@ -108,24 +122,60 @@ public: //--------------------------------------------------------------------------- -class wxIcon : public wxGDIImage { +class wxIcon +//: public wxGDIImage +{ public: wxIcon(const wxString& name, long flags, int desiredWidth = -1, int desiredHeight = -1); ~wxIcon(); bool LoadFile(const wxString& name, long flags); + + // 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 }; //--------------------------------------------------------------------------- -class wxCursor : public wxGDIImage { +class wxCursor +//: public wxGDIImage +{ public: #ifdef __WXMSW__ wxCursor(const wxString& cursorName, long flags, int hotSpotX=0, int hotSpotY=0); #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 }; %name(wxStockCursor) %new wxCursor* wxPyStockCursor(int id); @@ -266,7 +316,7 @@ public: #ifdef __WXMSW__ typedef unsigned long wxDash; #else -typedef byte wxDash; +typedef char wxDash; #endif diff --git a/utils/wxPython/src/my_typemaps.i b/utils/wxPython/src/my_typemaps.i index 66f501b1ae..96e637567a 100644 --- a/utils/wxPython/src/my_typemaps.i +++ b/utils/wxPython/src/my_typemaps.i @@ -79,9 +79,13 @@ } - +#ifdef __WXMSW__ %typemap(python,in) wxDash* LIST = unsigned long* LIST; %typemap(python,freearg) wxDash* LIST = unsigned long* LIST; +#else +%typemap(python,in) wxDash* LIST = byte* LIST; +%typemap(python,freearg) wxDash* LIST = byte* LIST; +#endif %typemap(python,in) char** LIST { diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i index 78c43a5d9c..0867a953bb 100644 --- a/utils/wxPython/src/stattool.i +++ b/utils/wxPython/src/stattool.i @@ -141,12 +141,14 @@ public: void EnableTool(int toolIndex, bool enable); +#ifdef __WXMSW__ wxToolBarTool* FindToolForPosition(long x, long y); wxSize GetToolSize(); wxSize GetToolBitmapSize(); void SetToolBitmapSize(const wxSize& size); - wxSize GetToolMargins(); wxSize GetMaxSize(); +#endif + wxSize GetToolMargins(); // wxObject* GetToolClientData(int toolIndex); bool GetToolEnabled(int toolIndex); wxString GetToolLongHelp(int toolIndex); @@ -164,16 +166,13 @@ public: void SetToolPacking(int packing); void SetToolSeparation(int separation); void ToggleTool(int toolIndex, const bool toggle); +#ifdef __WXMSW__ void SetToggle(int toolIndex, bool toggle); - void SetMaxRowsCols(int rows, int cols); int GetMaxRows(); int GetMaxCols(); - +#endif }; - - - //---------------------------------------------------------------------------