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

no need to check for 2.3.0 anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-03-21 23:12:29 +00:00
parent ee9768c9e0
commit 8d512476c5
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/src/xrc/xmlres.cpp
View File

@@ -911,15 +911,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
const wxArtClient& defaultArtClient, const wxArtClient& defaultArtClient,
wxSize size) wxSize size)
{ {
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size)); icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size));
#else
wxIcon *iconpt;
wxBitmap bmppt = GetBitmap(param, size);
iconpt = (wxIcon*)(&bmppt);
wxIcon icon(*iconpt);
#endif
return icon; return icon;
} }

7
src/xrc/xmlres.cpp
View File

@@ -911,15 +911,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
const wxArtClient& defaultArtClient, const wxArtClient& defaultArtClient,
wxSize size) wxSize size)
{ {
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size)); icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size));
#else
wxIcon *iconpt;
wxBitmap bmppt = GetBitmap(param, size);
iconpt = (wxIcon*)(&bmppt);
wxIcon icon(*iconpt);
#endif
return icon; return icon;
} }