set best fitting size for the toolbar in Realize()

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

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index afc541b13f4ef322ba6b01a78ee13259ab269914..0c257d02c960ee4285ecca5c766d1fb76e3bf46f 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -51,35 +51,31 @@ void wxIconRefData::Free()
 // ----------------------------------------------------------------------------
 
 wxIcon::wxIcon()
-: m_bIsXpm(FALSE)
+       :m_bIsXpm(false)
 {
 }
 
-wxIcon::wxIcon(
-  const char                        WXUNUSED(bits)[]
-, int                               WXUNUSED(nWidth)
-, int                               WXUNUSED(nHeight)
-)
-: m_bIsXpm(FALSE)
+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
-)
-: m_bIsXpm(FALSE)
+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
@@ -100,14 +96,12 @@ void wxIcon::CreateIconFromXpm(
     CopyFromBitmap(vBmp);
     if (GetHICON())
     {
-        m_bIsXpm = TRUE;
+        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;
@@ -236,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)
     {
@@ -253,6 +249,7 @@ void wxIcon::CopyFromBitmap(
                 ,rBmp.GetHeight()
                );
     }
+#endif
 
     if (!rBmp.GetMask())
     {
@@ -269,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;
 
@@ -291,6 +286,5 @@ bool wxIcon::LoadFile(
                               ,nDesiredHeight
                              ));
     else
-        return(FALSE);
+        return false;
 }
-