IsModified() function now works correctly

[wxWidgets.git] / src / msw / icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index f5daa68de4dbd0b3d669bde3483995bc94a0b8c0..740be06b7dd305b11b091c37ae5174f13fe99271 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -68,11 +68,11 @@ wxIcon::wxIcon(void)
 {
 }
 
-wxIcon::wxIcon(const char WXUNUSED(bits)[], const int WXUNUSED(width), const int WXUNUSED(height))
+wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
 {
 }
 
-wxIcon::wxIcon(const wxString& icon_file, const long flags,
+wxIcon::wxIcon(const wxString& icon_file, long flags,
     int desiredWidth, int desiredHeight)
 
 {
@@ -93,7 +93,7 @@ bool wxIcon::FreeResource(bool force)
   return TRUE;
 }
 
-bool wxIcon::LoadFile(const wxString& filename, const long type,
+bool wxIcon::LoadFile(const wxString& filename, long type,
     int desiredWidth, int desiredHeight)
 {
   UnRef();
@@ -116,7 +116,7 @@ void wxIcon::SetHICON(WXHICON ico)
   M_ICONDATA->m_hIcon = ico;
 }
 
-bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth, int desiredHeight)
 {
 #if USE_RESOURCE_LOADING_IN_MSW
@@ -137,7 +137,7 @@ bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const lo
 #endif
 }
 
-bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     int desiredWidth, int desiredHeight)
 {
        if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
@@ -154,13 +154,8 @@ bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, cons
     }
 
 #ifdef __WIN32__
-/***
-       DWORD vers = GetVersion() ;
-       WORD  high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
        // Win32s doesn't have GetIconInfo function...
-       if (M_ICONHANDLERDATA->m_hIcon && (high&0x8000)==0 )
-***/
-       if (M_ICONHANDLERDATA->m_hIcon && wxGetOsVersion()==wxWINDOWS_NT)
+       if (M_ICONHANDLERDATA->m_hIcon && wxGetOsVersion()!=wxWIN32S)
        {
                ICONINFO info ;
                if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))