From 8d512476c500acb2afc95f6763d99ffc9335e8fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 21 Mar 2003 23:12:29 +0000 Subject: [PATCH] no need to check for 2.3.0 anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 7 ------- src/xrc/xmlres.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 5fe1211066..9ee72b1b58 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -911,15 +911,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, const wxArtClient& defaultArtClient, wxSize size) { -#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) wxIcon icon; icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size)); -#else - wxIcon *iconpt; - wxBitmap bmppt = GetBitmap(param, size); - iconpt = (wxIcon*)(&bmppt); - wxIcon icon(*iconpt); -#endif return icon; } diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 5fe1211066..9ee72b1b58 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -911,15 +911,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, const wxArtClient& defaultArtClient, wxSize size) { -#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__) wxIcon icon; icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size)); -#else - wxIcon *iconpt; - wxBitmap bmppt = GetBitmap(param, size); - iconpt = (wxIcon*)(&bmppt); - wxIcon icon(*iconpt); -#endif return icon; } -- 2.45.2