change wxICON_INFO to wxICON_INFORMATION in Mac and MSW wxIcon code to be consistent...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 2ae29d1859f82b125aee47479f3ef0e16ab84f85..e886c1073ca51df91d7d384906f292e45b9e33b5 100644 (file)
--- 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 2ae29d1859f82b125aee47479f3ef0e16ab84f85..e886c1073ca51df91d7d384906f292e45b9e33b5 100644 (file)
--- 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 87fb6add432aae0c5ae1e855270b56d469bc48c9..26e92921109019ac763d12375cd9c4a30fab4549 100644 (file)
--- 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++ )