X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29172908bf90ddd8b70c5195b870745b5af3b7a3..2830b4a411593860aa75ae22478d09db14c789cf:/src/os2/icon.cpp?ds=sidebyside

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index 7995a85a23..8b31bf4b08 100644
--- 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"
@@ -78,7 +79,7 @@ wxIcon::wxIcon(
     //
     wxString                         sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
 
-    sOs2Name += "Os2.ico";
+    sOs2Name += wxT("Os2.ico");
     LoadFile( sOs2Name
              ,lFlags
              ,nDesiredWidth
@@ -134,11 +135,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() * 2,
-                                                      0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+    POINTL                          vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2},
+                                                      {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}
                                                     };
 
     POINTERINFO                     vIconInfo;