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

switched to new XPM code in wxMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-08 22:44:34 +00:00
parent 638a0b2c72
commit 66e23ad208
17 changed files with 37 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/resource.cpp
View File

@@ -2468,7 +2468,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
}
case wxBITMAP_TYPE_XPM_DATA:
{
#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@ -2476,10 +2475,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
return wxNullBitmap;
}
return wxBitmap((char **)item->GetValue1());
#else
wxLogWarning(_("No XPM facility available!"));
break;
#endif
}
default:
{
@@ -2625,7 +2620,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@ -2635,9 +2629,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
return NULL;
}
return wxIcon((char **)item->GetValue1());
#else
wxLogWarning(_("No XPM facility available!"));
#endif
*/
wxLogWarning(_("No XPM icon facility available!"));
break;