projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected blind fix of missing .c_str()s
[wxWidgets.git]
/
src
/
common
/
resourc2.cpp
diff --git
a/src/common/resourc2.cpp
b/src/common/resourc2.cpp
index 7774e5a7c51a6d61dbfab18caa03ceb5ad276e43..2321126dde829509e169b9da73d46ff4507f8ff9 100644
(file)
--- a/
src/common/resourc2.cpp
+++ b/
src/common/resourc2.cpp
@@
-817,7
+817,6
@@
wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
}
case wxBITMAP_TYPE_XPM_DATA:
{
}
case wxBITMAP_TYPE_XPM_DATA:
{
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@
-826,9
+825,6
@@
wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
return wxNullBitmap;
}
return wxBitmap(item->GetValue1());
return wxNullBitmap;
}
return wxBitmap(item->GetValue1());
-#else
- wxLogWarning(_("No XPM facility available!"));
-#endif
break;
}
default:
break;
}
default:
@@
-974,7
+970,6
@@
wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@
-984,9
+979,6
@@
wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
return NULL;
}
return wxIcon((char **)item->GetValue1());
return NULL;
}
return wxIcon((char **)item->GetValue1());
-#else
- wxLogWarning(_("No XPM facility available!"));
-#endif
*/
wxLogWarning(_("No XPM icon facility available!"));
break;
*/
wxLogWarning(_("No XPM icon facility available!"));
break;