X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe40185d40076711e97ef33de0b934da01f68e0a..7d1f4c3ff01b09105c07d5e176a14428c834975e:/wxPython/src/gdi.i diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index a8d6dd79bc..7544659159 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -51,12 +51,12 @@ public: class wxBitmap : public wxGDIObject { public: - wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_BMP); + wxBitmap(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY); ~wxBitmap(); wxPalette* GetPalette(); wxMask* GetMask(); - bool LoadFile(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_BMP); + bool LoadFile(const wxString& name, wxBitmapType type=wxBITMAP_TYPE_ANY); bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL); void SetMask(wxMask* mask); #ifdef __WXMSW__ @@ -1167,7 +1167,7 @@ public: //--------------------------------------------------------------------------- -#ifndef __WXGTK__ +#ifdef __WXMSW__ %{ #include @@ -1267,7 +1267,9 @@ public: ~wxRegion(); void Clear(); +#ifndef __WXMAC__ bool Offset(wxCoord x, wxCoord y); +#endif wxRegionContain Contains(long x, long y); %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);