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

change wxICON_INFO to wxICON_INFORMATION in Mac and MSW wxIcon code to be consistent with the constants

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-24 00:22:40 +00:00
parent 3242feb1c0
commit c2edb18a7d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/icon.cpp
View File

@@ -84,7 +84,7 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight)
{ {
short theId = -1 ; short theId = -1 ;
if ( name == "wxICON_INFO" ) if ( name == "wxICON_INFORMATION" )
{ {
theId = kNoteIcon ; theId = kNoteIcon ;
} }

2
src/mac/icon.cpp
View File

@@ -84,7 +84,7 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight)
{ {
short theId = -1 ; short theId = -1 ;
if ( name == "wxICON_INFO" ) if ( name == "wxICON_INFORMATION" )
{ {
theId = kNoteIcon ; theId = kNoteIcon ;
} }

2
src/msw/gdiimage.cpp
View File

@@ -539,7 +539,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
{ wxT("wxICON_QUESTION"), IDI_QUESTION }, { wxT("wxICON_QUESTION"), IDI_QUESTION },
{ wxT("wxICON_WARNING"), IDI_EXCLAMATION }, { wxT("wxICON_WARNING"), IDI_EXCLAMATION },
{ wxT("wxICON_ERROR"), IDI_HAND }, { wxT("wxICON_ERROR"), IDI_HAND },
{ wxT("wxICON_INFO"), IDI_ASTERISK }, { wxT("wxICON_INFORMATION"), IDI_ASTERISK },
}; };
for ( size_t nIcon = 0; !hicon && nIcon < WXSIZEOF(stdIcons); nIcon++ ) for ( size_t nIcon = 0; !hicon && nIcon < WXSIZEOF(stdIcons); nIcon++ )