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

Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/resource.cpp
View File

@@ -2090,7 +2090,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
}
break;
}
#ifdef __WINDOWS__
#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2165,7 +2165,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
}
case wxBITMAP_TYPE_XPM_DATA:
{
#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@ -2263,7 +2263,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
}
break;
}
#ifdef __WINDOWS__
#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2340,7 +2340,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{