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

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

src/cocoa/statbmp.mm

@@ -1,24 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/statbmp.mm
+// Name:        src/cocoa/statbmp.mm
 // Purpose:     wxStaticBitmap
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/statbmp.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/statbmp.h"
 #endif //WX_PRECOMP
+
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSImageView.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
@@ -59,4 +63,3 @@ wxBitmap wxStaticBitmap::GetBitmap() const
 {
     return wxNullBitmap;
 }
-

src/common/ctrlcmn.cpp

@@ -31,11 +31,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/radiobut.h"
+    #include "wx/statbmp.h"
 #endif
 
 #if wxUSE_STATBMP
     #include "wx/bitmap.h"
-    #include "wx/statbmp.h"
 #endif // wxUSE_STATBMP
 
 const wxChar wxControlNameStr[] = wxT("control");

src/univ/statbmp.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/statbmp.cpp
+// Name:        src/univ/statbmp.cpp
 // Purpose:     wxStaticBitmap implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,10 +25,11 @@
 
 #if wxUSE_STATBMP
 
+#include "wx/statbmp.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
-    #include "wx/statbmp.h"
     #include "wx/validate.h"
 #endif
 
@@ -105,4 +106,3 @@ void wxStaticBitmap::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_STATBMP
-

src/unix/taskbarx11.cpp

@@ -27,10 +27,10 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
+    #include "wx/statbmp.h"
 #endif
 
 #include "wx/bitmap.h"
-#include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/image.h"
 
@@ -118,7 +118,7 @@ protected:
 BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
     EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
-    EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent)
+    EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent)
     EVT_PAINT(wxTaskBarIconArea::OnPaint)
 END_EVENT_TABLE()
 

src/xrc/xh_stbmp.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbmp.cpp
+// Name:        src/xrc/xh_stbmp.cpp
 // Purpose:     XRC resource for wxStaticBitmap
 // Author:      Vaclav Slavik
 // Created:     2000/04/22
@@ -15,10 +15,13 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_STATBMP
 
 #include "wx/xrc/xh_stbmp.h"
+
+#ifndef  WX_PRECOMP
     #include "wx/statbmp.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler)
 
@@ -49,4 +52,4 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_STATBMP