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

Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back

Browse Source 
some things that were changed/removed from my patch I submitted to
them.)

Since it is now possible easily and simply share the SWIG type tables
across modules I reverted to always using the stock SWIG runtime
instead of my slightly hacked up version of it exported via the
wxPython C API.

The %name directive is now deprecated so replaced most uses of it with
a custom %Rename macro that uses %rename internally.  These will
evetually need to be replaced with a DocDecl macro when docstrings are
added.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-23 20:44:09 +00:00
parent 47261ba05f
commit 1b8c7ba607
76 changed files with 482 additions and 1650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
wxPython/src/_image.i
View File

@@ -76,15 +76,32 @@ success flag and rgb values.", "");
class wxImage : public wxObject {
public:
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
DocCtorStr(
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ),
"", "");
~wxImage();
// Alternate constructors
%name(ImageFromMime) wxImage(const wxString& name, const wxString& mimetype, int index = -1);
%name(ImageFromStream) wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
%name(ImageFromStreamMime) wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1 );
DocCtorStrName(
wxImage(const wxString& name, const wxString& mimetype, int index = -1),
"", "",
ImageFromMime);
DocCtorStrName(
wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1),
"", "",
ImageFromStream);
DocCtorStrName(
wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1 ),
"", "",
ImageFromStreamMime);
%extend {
%name(EmptyImage) wxImage(int width=0, int height=0, bool clear = true) {
%rename(EmptyImage) wxImage(int width=0, int height=0, bool clear = true);
wxImage(int width=0, int height=0, bool clear = true)
{
if (width > 0 && height > 0)
return new wxImage(width, height, clear);
else
@@ -92,11 +109,15 @@ public:
}
MustHaveApp(wxImage(const wxBitmap &bitmap));
%name(ImageFromBitmap) wxImage(const wxBitmap &bitmap) {
%rename(ImageFromBitmap) wxImage(const wxBitmap &bitmap);
wxImage(const wxBitmap &bitmap)
{
return new wxImage(bitmap.ConvertToImage());
}
%name(ImageFromData) wxImage(int width, int height, unsigned char* data) {
%rename(ImageFromData) wxImage(int width, int height, unsigned char* data);
wxImage(int width, int height, unsigned char* data)
{
// Copy the source data so the wxImage can clean it up later
unsigned char* copy = (unsigned char*)malloc(width*height*3);
if (copy == NULL) {
@@ -106,8 +127,11 @@ public:
memcpy(copy, data, width*height*3);
return new wxImage(width, height, copy, false);
}
%name(ImageFromDataWithAlpha) wxImage(int width, int height,
unsigned char* data, unsigned char* alpha) {
%rename(ImageFromDataWithAlpha) wxImage(int width, int height, unsigned char* data, unsigned char* alpha);
wxImage(int width, int height, unsigned char* data, unsigned char* alpha)
{
// Copy the source data so the wxImage can clean it up later
unsigned char* dcopy = (unsigned char*)malloc(width*height*3);
if (dcopy == NULL) {
@@ -190,14 +214,14 @@ The method will then fill up the whole image with the colour given.", "");
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
%name(LoadMimeFile)bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 );
%Rename(LoadMimeFile, bool, LoadFile( const wxString& name, const wxString& mimetype, int index = -1 ));
bool SaveFile( const wxString& name, int type );
%name(SaveMimeFile)bool SaveFile( const wxString& name, const wxString& mimetype );
%Rename(SaveMimeFile, bool, SaveFile( const wxString& name, const wxString& mimetype ));
%name(CanReadStream) static bool CanRead( wxInputStream& stream );
%name(LoadStream) bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
%name(LoadMimeStream) bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
%Rename(CanReadStream, static bool, CanRead( wxInputStream& stream ));
%Rename(LoadStream, bool, LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 ));
%Rename(LoadMimeStream, bool, LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ));
bool Ok();
int GetWidth();
@@ -341,7 +365,7 @@ The method will then fill up the whole image with the colour given.", "");
wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
void SetOption(const wxString& name, const wxString& value);
%name(SetOptionInt)void SetOption(const wxString& name, int value);
%Rename(SetOptionInt, void, SetOption(const wxString& name, int value));
wxString GetOption(const wxString& name) const;
int GetOptionInt(const wxString& name) const;
bool HasOption(const wxString& name) const;