Include wx/wx/bmpbuttn.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/bmpbuttn.mm

@@ -13,8 +13,9 @@
 
 #if wxUSE_BMPBUTTON
 
-#ifndef WX_PRECOMP
 #include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 

src/generic/dirdlgg.cpp

@@ -26,13 +26,13 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
+    #include "wx/bmpbuttn.h"
 #endif
 
 #include "wx/statline.h"
 #include "wx/dirctrl.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/artprov.h"
-#include "wx/bmpbuttn.h"
 
 // ----------------------------------------------------------------------------
 // constants

src/generic/filedlgg.cpp

@@ -29,6 +29,7 @@
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
+    #include "wx/bmpbuttn.h"
 #endif
 
 #include "wx/checkbox.h"
@@ -38,7 +39,6 @@
 #include "wx/stattext.h"
 #include "wx/longlong.h"
 #include "wx/sizer.h"
-#include "wx/bmpbuttn.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"

src/msw/bmpbuttn.cpp

@@ -18,8 +18,9 @@
 
 #if wxUSE_BMPBUTTON
 
-#ifndef WX_PRECOMP
 #include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #endif

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"
@@ -57,15 +58,15 @@ bool wxBitmapButton::Create( wxWindow*          pParent,
     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;
@@ -104,7 +105,7 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
     bool         bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
 
     if (!pUser)
-        return FALSE;
+        return false;
 
     wxBitmap*  pBitmap;
     bool       bIsSelected = pUser->fsState & BDS_HILITED;
@@ -120,7 +121,7 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
         pBitmap = &m_bmpNormal;
 
     if (!pBitmap->Ok() )
-        return FALSE;
+        return false;
 
 
     //

src/palmos/bmpbuttn.cpp

@@ -18,8 +18,9 @@
 
 #if wxUSE_BMPBUTTON
 
-#ifndef WX_PRECOMP
 #include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #endif
@@ -127,4 +128,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 }
 
 #endif // wxUSE_BMPBUTTON
-

src/univ/bmpbuttn.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/bmpbuttn.cpp
+// Name:        src/univ/bmpbuttn.cpp
 // Purpose:     wxBitmapButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,9 +25,10 @@
 
 #if wxUSE_BMPBUTTON
 
+#include "wx/bmpbuttn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
-    #include "wx/bmpbuttn.h"
     #include "wx/validate.h"
 #endif
 
@@ -154,4 +155,3 @@ void wxBitmapButton::Release()
 }
 
 #endif // wxUSE_BMPBUTTON
-

src/xrc/xh_bmpbt.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.cpp
+// Name:        src/xrc/xh_bmpbt.cpp
 // Purpose:     XRC resource for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -15,10 +15,13 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BMPBUTTON
 
 #include "wx/xrc/xh_bmpbt.h"
+
+#ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
 
@@ -64,4 +67,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON