fix for the last printf format warning fix

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

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index ed319ad85a0fbf4e0e0530ad69bb75c14899812d..12ce06f72792376c8f8b149caebd02f66567e57c 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.cpp
+// Name:        src/os2/bmpbuttn.cpp
 // Purpose:     wxBitmapButton
 // Author:      David Webster
 // Modified by:
@@ -14,8 +14,9 @@
 
 #if wxUSE_BMPBUTTON
 
-#ifndef WX_PRECOMP
 #include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
 #endif
 
 #include "wx/os2/private.h"
@@ -52,20 +53,20 @@ bool wxBitmapButton::Create( wxWindow*          pParent,
         m_marginY = wxDEFAULT_BUTTON_MARGIN;
     }
 
-    int                             nX      = rPos.x;
-    int                             nY      = rPos.y;
-    int                             nWidth  = rSize.x;
-    int                             nHeight = rSize.y;
+    int nX      = rPos.x;
+    int nY      = rPos.y;
+    int nWidth  = rSize.x;
+    int nHeight = rSize.y;
 
-    if (vId == -1)
+    if (vId == wxID_ANY)
         m_windowId = NewControlId();
     else
         m_windowId = vId;
 
-    if (nWidth == -1 && rBitmap.Ok())
+    if (nWidth == wxDefaultCoord && rBitmap.Ok())
         nWidth = rBitmap.GetWidth() + 4 * m_marginX;
 
-    if (nHeight == -1 && rBitmap.Ok())
+    if (nHeight == wxDefaultCoord && rBitmap.Ok())
         nHeight = rBitmap.GetHeight() + 4 * m_marginY;
 
     ULONG                           ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
@@ -100,15 +101,15 @@ bool wxBitmapButton::Create( wxWindow*          pParent,
 
 bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
 {
-    PUSERBUTTON                     pUser     = (PUSERBUTTON)pItem;
-    bool                            bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+    PUSERBUTTON  pUser     = (PUSERBUTTON)pItem;
+    bool         bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
 
     if (!pUser)
-        return FALSE;
+        return false;
 
-    wxBitmap*                       pBitmap;
-    bool                            bIsSelected = pUser->fsState & BDS_HILITED;
-    wxClientDC                      vDc(this);
+    wxBitmap*  pBitmap;
+    bool       bIsSelected = pUser->fsState & BDS_HILITED;
+    wxClientDC vDc(this);
 
     if (bIsSelected && m_bmpSelected.Ok())
         pBitmap = &m_bmpSelected;
@@ -120,7 +121,7 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
         pBitmap = &m_bmpNormal;
 
     if (!pBitmap->Ok() )
-        return FALSE;
+        return false;
 
 
     //