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

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

include/wx/generic/statusbr.h

@@ -12,6 +12,10 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_STATUSBAR
+
 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"
@@ -22,104 +26,106 @@ extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
-  wxStatusBarGeneric() { Init(); }
-  wxStatusBarGeneric(wxWindow *parent,
-              wxWindowID winid,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxFULL_REPAINT_ON_RESIZE,
-              const wxString& name = wxPanelNameStr)
-  {
-      Init();
+    wxStatusBarGeneric() { Init(); }
+    wxStatusBarGeneric(wxWindow *parent,
+                       wxWindowID winid,
+                       const wxPoint& pos = wxDefaultPosition,
+                       const wxSize& size = wxDefaultSize,
+                       long style = wxFULL_REPAINT_ON_RESIZE,
+                       const wxString& name = wxPanelNameStr)
+    {
+        Init();
 
-      Create(parent, winid, pos, size, style, name);
-  }
-  wxStatusBarGeneric(wxWindow *parent,
-                     wxWindowID winid,
-                     long style,
-                     const wxString& name = wxPanelNameStr)
-  {
-      Init();
+        Create(parent, winid, pos, size, style, name);
+    }
+    wxStatusBarGeneric(wxWindow *parent,
+                       wxWindowID winid,
+                       long style,
+                       const wxString& name = wxPanelNameStr)
+    {
+        Init();
 
-      Create(parent, winid, style, name);
-  }
+        Create(parent, winid, style, name);
+    }
 
-  virtual ~wxStatusBarGeneric();
+    virtual ~wxStatusBarGeneric();
 
-  bool Create(wxWindow *parent, wxWindowID winid,
-              const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
-              const wxSize& WXUNUSED(size) = wxDefaultSize,
-              long style = wxFULL_REPAINT_ON_RESIZE,
-              const wxString& name = wxPanelNameStr)
-  {
-      return Create(parent, winid, style, name);
-  }
+    bool Create(wxWindow *parent, wxWindowID winid,
+                const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
+                const wxSize& WXUNUSED(size) = wxDefaultSize,
+                long style = wxFULL_REPAINT_ON_RESIZE,
+                const wxString& name = wxPanelNameStr)
+    {
+        return Create(parent, winid, style, name);
+    }
 
-  bool Create(wxWindow *parent, wxWindowID winid,
-              long style,
-              const wxString& name = wxPanelNameStr);
+    bool Create(wxWindow *parent, wxWindowID winid,
+                long style,
+                const wxString& name = wxPanelNameStr);
 
-  // Create status line
-  virtual void SetFieldsCount(int number = 1,
-                              const int *widths = (const int *) NULL);
+    // Create status line
+    virtual void SetFieldsCount(int number = 1,
+                                const int *widths = (const int *) NULL);
 
-  // Set status line text
-  virtual void SetStatusText(const wxString& text, int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
+    // Set status line text
+    virtual void SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;
 
-  // Set status line widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
+    // Set status line widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);
 
-  // Get the position and size of the field's internal bounding rectangle
-  virtual bool GetFieldRect(int i, wxRect& rect) const;
+    // Get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;
 
-  // sets the minimal vertical size of the status bar
-  virtual void SetMinHeight(int height);
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);
 
-  virtual int GetBorderX() const { return m_borderX; }
-  virtual int GetBorderY() const { return m_borderY; }
+    virtual int GetBorderX() const { return m_borderX; }
+    virtual int GetBorderY() const { return m_borderY; }
 
-  ////////////////////////////////////////////////////////////////////////
-  // Implementation
+    ////////////////////////////////////////////////////////////////////////
+    // Implementation
 
-  virtual void DrawFieldText(wxDC& dc, int i);
-  virtual void DrawField(wxDC& dc, int i);
+    virtual void DrawFieldText(wxDC& dc, int i);
+    virtual void DrawField(wxDC& dc, int i);
 
-  void SetBorderX(int x);
-  void SetBorderY(int y);
+    void SetBorderX(int x);
+    void SetBorderY(int y);
 
-  void OnPaint(wxPaintEvent& event);
+    void OnPaint(wxPaintEvent& event);
 
-  void OnLeftDown(wxMouseEvent& event);
-  void OnRightDown(wxMouseEvent& event);
+    void OnLeftDown(wxMouseEvent& event);
+    void OnRightDown(wxMouseEvent& event);
 
-  virtual void InitColours();
+    virtual void InitColours();
 
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  // common part of all ctors
-  void Init();
+    // common part of all ctors
+    void Init();
 
-  wxArrayString     m_statusStrings;
+    wxArrayString     m_statusStrings;
 
-  // the last known width of the client rect (used to rebuild cache)
-  int               m_lastClientWidth;
-  // the widths of the status bar panes in pixels
-  wxArrayInt        m_widthsAbs;
+    // the last known width of the client rect (used to rebuild cache)
+    int               m_lastClientWidth;
+    // the widths of the status bar panes in pixels
+    wxArrayInt        m_widthsAbs;
 
-  int               m_borderX;
-  int               m_borderY;
-  wxPen             m_mediumShadowPen;
-  wxPen             m_hilightPen;
+    int               m_borderX;
+    int               m_borderY;
+    wxPen             m_mediumShadowPen;
+    wxPen             m_hilightPen;
 
-  virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;
 
 private:
-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
 
+#endif // wxUSE_STATUSBAR
+
 #endif
     // _WX_GENERIC_STATUSBR_H_

include/wx/statusbr.h

@@ -12,10 +12,11 @@
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
-#include "wx/window.h"
+#include "wx/defs.h"
 
 #if wxUSE_STATUSBAR
 
+#include "wx/window.h"
 #include "wx/list.h"
 #include "wx/dynarray.h"
 

src/common/framecmn.cpp

@@ -30,11 +30,8 @@
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
     #include "wx/toolbar.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
-#endif
+#endif // WX_PRECOMP
 
 // ----------------------------------------------------------------------------
 // event table

src/common/statbar.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/statbar.cpp
+// Name:        src/common/statbar.cpp
 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
-    #include "wx/statusbr.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_STATUSBAR
@@ -354,4 +355,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
 }
 
 #endif // wxUSE_STATUSBAR
-

src/generic/statusbr.cpp

@@ -18,6 +18,8 @@
 
 #if wxUSE_STATUSBAR
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/settings.h"
@@ -29,8 +31,6 @@
 #include "wx/gtk/win_gtk.h"
 #endif
 
-#include "wx/statusbr.h"
-
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
 // standard wxStatusBar class, if wxStatusBarGeneric is the same as
 // wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in

src/gtk/frame.cpp

@@ -27,11 +27,8 @@
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
-#endif
+#endif // WX_PRECOMP
 
 #include <glib.h>
 #include "wx/gtk/private.h"

src/gtk/window.cpp

@@ -31,6 +31,7 @@
     #include "wx/toolbar.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"
+    #include "wx/statusbr.h"
 #endif
 
 #include "wx/module.h"
@@ -47,7 +48,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
-#include "wx/statusbr.h"
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

src/gtk1/frame.cpp

@@ -27,11 +27,8 @@
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
-#endif
+#endif // WX_PRECOMP
 
 #include <glib.h>
 #include "wx/gtk1/private.h"

src/gtk1/window.cpp

@@ -30,6 +30,7 @@
     #include "wx/textctrl.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"
+    #include "wx/statusbr.h"
 #endif
 
 #include "wx/module.h"
@@ -46,7 +47,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
-#include "wx/statusbr.h"
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

src/mac/carbon/frame.cpp

@@ -20,9 +20,9 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
-#include "wx/statusbr.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

src/mac/carbon/window.cpp

@@ -31,10 +31,10 @@
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
     #include "wx/layout.h"
+    #include "wx/statusbr.h"
 #endif
 
 #include "wx/tooltip.h"
-#include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

src/mac/classic/frame.cpp

@@ -20,9 +20,9 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
-#include "wx/statusbr.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

src/mac/classic/statbrma.cpp

@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -88,14 +91,14 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
 void wxStatusBarMac::SetStatusText(const wxString& text, int number)
 {
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
-        _T("invalid status bar field index") );
+                 _T("invalid status bar field index") );
 
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     rect.y=0;
     rect.height = m_height ;
-    Refresh( TRUE , &rect ) ;
+    Refresh( true , &rect ) ;
     Update();
 }
 
@@ -149,6 +152,6 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled )
 {
-    Refresh(FALSE) ;
+    Refresh(false) ;
     wxWindow::MacSuperEnabled( enabled ) ;
 }

src/mac/classic/window.cpp

@@ -30,12 +30,12 @@
     #include "wx/statbox.h"
     #include "wx/listbox.h"
     #include "wx/layout.h"
+    #include "wx/statusbr.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"
-#include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

src/motif/frame.cpp

@@ -36,10 +36,9 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif
 
-#include "wx/statusbr.h"
-
 #ifdef __VMS__
     #pragma message disable nosimpint
 #endif

src/msw/frame.cpp

@@ -37,6 +37,7 @@
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -50,10 +51,7 @@
     #include "wx/msw/winundef.h"
 #endif
 
-#if wxUSE_STATUSBAR
-    #include "wx/statusbr.h"
-    #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
+#include "wx/generic/statusbr.h"
 
 #include "wx/menuitem.h"
 

src/msw/mdi.cpp

@@ -34,9 +34,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #if wxUSE_STATUSBAR
-        #include "wx/statusbr.h"
-    #endif
+    #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

src/os2/dc.cpp

@@ -24,10 +24,8 @@
     #include "wx/icon.h"
     #include "wx/msgdlg.h"
     #include "wx/dcprint.h"
-#if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif
-#endif
 
 #include "wx/module.h"
 
@@ -2729,12 +2727,10 @@ bool wxDC::DoBlit( wxCoord vXdest,
     return bSuccess;
 }
 
-void wxDC::DoGetSize(
-  int*                              pnWidth
-, int*                              pnHeight
-) const
+void wxDC::DoGetSize( int* pnWidth,
+                      int* pnHeight ) const
 {
-    LONG                            lArray[CAPS_HEIGHT];
+    LONG lArray[CAPS_HEIGHT];
 
     if(::DevQueryCaps( m_hDC
                       ,CAPS_FAMILY
@@ -2802,10 +2798,7 @@ wxSize wxDC::GetPPI() const
     return ppisize;
 } // end of wxDC::GetPPI
 
-void wxDC::SetLogicalScale(
-  double                            dX
-, double                            dY
-)
+void wxDC::SetLogicalScale( double dX, double dY )
 {
     m_logicalScaleX = dX;
     m_logicalScaleY = dY;

src/os2/frame.cpp

@@ -30,14 +30,12 @@
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 
-#if wxUSE_STATUSBAR
-    #include "wx/statusbr.h"
-    #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
+#include "wx/generic/statusbr.h"
 
 #include "wx/menuitem.h"
 

src/palmos/frame.cpp

@@ -37,12 +37,10 @@
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_STATUSBAR
-    #include "wx/statusbr.h"
-    #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
+#include "wx/generic/statusbr.h"
 
 #include "wx/menuitem.h"
 

src/palmos/mdi.cpp

@@ -34,9 +34,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #if wxUSE_STATUSBAR
-        #include "wx/statusbr.h"
-    #endif
+    #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

src/univ/statusbr.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/statusbr.cpp
+// Name:        src/univ/statusbr.cpp
 // Purpose:     wxStatusBar implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,12 +25,13 @@
 
 #if wxUSE_STATUSBAR
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #endif
 
-#include "wx/statusbr.h"
 #include "wx/toplevel.h"
 
 #include "wx/univ/renderer.h"
@@ -327,4 +328,3 @@ int wxStatusBarUniv::GetBorderY() const
 }
 
 #endif // wxUSE_STATUSBAR
-

src/xrc/xh_statbar.cpp

@@ -23,14 +23,13 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/frame.h"
+    #include "wx/statusbr.h"
 #endif
 
-#include "wx/statusbr.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 
-wxStatusBarXmlHandler::wxStatusBarXmlHandler() :
-        wxXmlResourceHandler()
+wxStatusBarXmlHandler::wxStatusBarXmlHandler()
+                      :wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);
     AddWindowStyles();