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

A few changes to match header changes and let wxPython compile again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-04-20 00:36:03 +00:00
parent 1cfd32fa13
commit 0a651eb856
8 changed files with 206 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wxPython/src/image.i
View File

@@ -170,17 +170,15 @@ public:
};
// Alternate constructors
%new wxImage* wxNullImage();
%new wxImage* wxEmptyImage(int width, int height);
%new wxImage* wxEmptyImage(int width=0, int height=0);
%new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype);
%new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
%{
wxImage* wxNullImage() {
return new wxImage;
}
wxImage* wxEmptyImage(int width, int height) {
return new wxImage(width, height);
wxImage* wxEmptyImage(int width=0, int height=0) {
if (width == 0 && height == 0)
return new wxImage;
else
return new wxImage(width, height);
}
wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype) {
@@ -192,8 +190,22 @@ public:
}
%}
void wxInitAllImageHandlers();
%readonly
%{
#if 0
%}
extern wxImage wxNullImage;
%readwrite
%{
#endif
%}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------