check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index fe662a13f8d264a71cf2bd6e7bae53b0c05a0f8a..0c257d02c960ee4285ecca5c766d1fb76e3bf46f 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -22,6 +22,7 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -50,32 +51,31 @@ void wxIconRefData::Free()
 // ----------------------------------------------------------------------------
 
 wxIcon::wxIcon()
+       :m_bIsXpm(false)
 {
 }
 
-wxIcon::wxIcon(
-  const char                        WXUNUSED(bits)[]
-, int                               WXUNUSED(nWidth)
-, int                               WXUNUSED(nHeight)
-)
+wxIcon::wxIcon( const char WXUNUSED(bits)[],
+                int        WXUNUSED(nWidth),
+                int        WXUNUSED(nHeight) )
+       :m_bIsXpm(false)
 {
 }
 
-wxIcon::wxIcon(
-  const wxString&                   rIconFile
-, long                              lFlags
-, int                               nDesiredWidth
-, int                               nDesiredHeight
-)
+wxIcon::wxIcon( const wxString& rIconFile,
+                long            lFlags,
+                int             nDesiredWidth,
+                int             nDesiredHeight )
+       :m_bIsXpm(false)
 {
     //
     // A very poor hack, but we have to have separate icon files from windows
     // So we have a modified name where replace the last three characters
     // with os2.  Also need the extension.
     //
-    wxString                         sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
+    wxString sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
 
-    sOs2Name += "Os2.ico";
+    sOs2Name += wxT("Os2.ico");
     LoadFile( sOs2Name
              ,lFlags
              ,nDesiredWidth
@@ -94,11 +94,14 @@ void wxIcon::CreateIconFromXpm(
     wxBitmap                        vBmp(ppData);
 
     CopyFromBitmap(vBmp);
+    if (GetHICON())
+    {
+        m_bIsXpm = true;
+        m_vXpmSrc = vBmp;
+    }
 } // end of wxIcon::CreateIconFromXpm
 
-void wxIcon::CopyFromBitmap(
-  const wxBitmap&                   rBmp
-)
+void wxIcon::CopyFromBitmap( const wxBitmap& rBmp )
 {
     wxMask*                         pMask = rBmp.GetMask();
     HBITMAP                         hBmp = NULLHANDLE;
@@ -126,11 +129,11 @@ void wxIcon::CopyFromBitmap(
     HDC                             hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
     HPS                             hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
     HPS                             hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
-    POINTL                          vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(),
-                                                  0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+    POINTL                          vPoint[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()},
+                                                  {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
                                                 };
-    POINTL                          vPointMask[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(),
-                                                      0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+    POINTL                          vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2},
+                                                      {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
                                                     };
 
     POINTERINFO                     vIconInfo;
@@ -185,7 +188,7 @@ void wxIcon::CopyFromBitmap(
     }
     vIconInfo.hbmColor = hBmp;
 
-    vHeader.cy              = (ULONG)rBmp.GetHeight();
+    vHeader.cy              = (ULONG)rBmp.GetHeight() * 2;
     hBmpMask = ::GpiCreateBitmap( hPSDst
                                  ,&vHeader
                                  ,0L
@@ -227,9 +230,11 @@ void wxIcon::CopyFromBitmap(
 
     vIconInfo.hbmPointer = hBmpMask;
 
-    HICON                           hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP
-                                                                       ,&vIconInfo
-                                                                      );
+#if !(defined(__WATCOMC__) && __WATCOMC__ < 1240 )
+// Open Watcom 1.3 had incomplete headers
+// that's reported and should be fixed for OW 1.4
+
+    HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo);
 
     if (!hIcon)
     {
@@ -244,6 +249,7 @@ void wxIcon::CopyFromBitmap(
                 ,rBmp.GetHeight()
                );
     }
+#endif
 
     if (!rBmp.GetMask())
     {
@@ -260,12 +266,10 @@ void wxIcon::CopyFromBitmap(
     ::DevCloseDC(hDCDst);
 } // end of wxIcon::CopyFromBitmap
 
-bool wxIcon::LoadFile(
-  const wxString&                   rFilename
-, long                              lType
-, int                               nDesiredWidth
-, int                               nDesiredHeight
-)
+bool wxIcon::LoadFile( const wxString& rFilename,
+                       long lType,
+                       int nDesiredWidth,
+                       int nDesiredHeight )
 {
     HPS                             hPs = NULLHANDLE;
 
@@ -282,6 +286,5 @@ bool wxIcon::LoadFile(
                               ,nDesiredHeight
                              ));
     else
-        return(FALSE);
+        return false;
 }
-