cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for differences between wxMSW and wxGTK`

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-12-15 19:46:19 +00:00
parent 6de20863de
commit 5bff6bb8ea
4 changed files with 94 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/wxPython/demo/GenericButtons.py
View File

@ -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()

94
utils/wxPython/src/gdi.i
View File

@ -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

6
utils/wxPython/src/my_typemaps.i
View File

@ -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 {

11
utils/wxPython/src/stattool.i
View File

@ -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
};
//---------------------------------------------------------------------------