Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate
changes to wxIcon. Fix deprecation warnings and use %p to format WXWidget in debug output (fixes the 4 non-deprecation warnings). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -39,11 +39,11 @@ public:
|
||||
wxIcon(const char **data);
|
||||
wxIcon(char **data);
|
||||
|
||||
wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
|
||||
wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
|
||||
int desiredWidth = -1, int desiredHeight = -1);
|
||||
~wxIcon();
|
||||
|
||||
bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
|
||||
bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
|
||||
int desiredWidth = -1, int desiredHeight = -1);
|
||||
|
||||
// create from bitmap (which should have a mask unless it's monochrome):
|
||||
|
Reference in New Issue
Block a user