Applied gsockmsw.c 1.20 to 1.25 changes

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 26cabaa71c197710b2bb639a90f129f46e1de1a5..3df7a179793a5ca70bed40a791b80842dfc465da 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -585,7 +585,10 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
 wxSize wxGetHiconSize(HICON hicon)
 {
-    wxSize size(32, 32);    // default
+    // default icon size on this hardware
+    // usually 32x32 but can be other (smaller) on pocket devices
+    wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
+
 #ifndef __WXWINCE__
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
@@ -611,6 +614,8 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
+#else
+    wxUnusedVar(hicon);
 #endif
     return size;
 }