* Apply patch #735595. Add miminumAcceptable{Height,Width}

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

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 1d504dd9747b91dfbfd93c5ca6710abbb7d1158d..6ce8557e4e73a35aa9ddc3c80bdf1c5ca339d0a3 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -366,16 +366,9 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon,
             wxString strExpPath = wxExpandEnvVars(strFullPath);
             // here we need C based counting!
             int nIndex = wxAtoi(strIndex);
             wxString strExpPath = wxExpandEnvVars(strFullPath);
             // here we need C based counting!
             int nIndex = wxAtoi(strIndex);

-#ifdef __DIGITALMARS__
-//FIXME __DIGITALMARS__ April 2003 CE
-    // why no ExtractIcon in library
-            wxLogTrace(_T("wxFileTypeImpl::GetIcon"),
-                   _T("Returning false from wxFileTypeImpl::GetIcon because of DigitalMars compiler bug"));
-            HICON hIcon = 0 ;
-#else

 
             HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);
 
             HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex);

-#endif
+

             switch ( (int)hIcon ) {
                 case 0: // means no icons were found
                 case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...
             switch ( (int)hIcon ) {
                 case 0: // means no icons were found
                 case 1: // means no such file or it wasn't a DLL/EXE/OCX/ICO/...