From c2edb18a7dc443fc0902945956a355ed722144fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 24 Mar 2002 00:22:40 +0000 Subject: [PATCH] change wxICON_INFO to wxICON_INFORMATION in Mac and MSW wxIcon code to be consistent with the constants git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/icon.cpp | 2 +- src/mac/icon.cpp | 2 +- src/msw/gdiimage.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp index 2ae29d1859..e886c1073c 100644 --- a/src/mac/carbon/icon.cpp +++ b/src/mac/carbon/icon.cpp @@ -84,7 +84,7 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo int desiredWidth, int desiredHeight) { short theId = -1 ; - if ( name == "wxICON_INFO" ) + if ( name == "wxICON_INFORMATION" ) { theId = kNoteIcon ; } diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp index 2ae29d1859..e886c1073c 100644 --- a/src/mac/icon.cpp +++ b/src/mac/icon.cpp @@ -84,7 +84,7 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo int desiredWidth, int desiredHeight) { short theId = -1 ; - if ( name == "wxICON_INFO" ) + if ( name == "wxICON_INFORMATION" ) { theId = kNoteIcon ; } diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 87fb6add43..26e9292110 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -539,7 +539,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon, { wxT("wxICON_QUESTION"), IDI_QUESTION }, { wxT("wxICON_WARNING"), IDI_EXCLAMATION }, { 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++ ) -- 2.50.0