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

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 06c8ec47914892006881da2fe97336e639638235..e7aca327b121502890a9e9f3470aacc38a49d835 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,6 +12,10 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
 #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"
 #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:
 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:
 
 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:
 
 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_
 #endif
     // _WX_GENERIC_STATUSBR_H_

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8fb907d6253dff46338ed2c50e1d583afdf4a80a..cb07ac1fd12cc325432f8b48b63c179277242230 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -12,10 +12,11 @@
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

-#include "wx/window.h"
+#include "wx/defs.h"

 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/window.h"

 #include "wx/list.h"
 #include "wx/dynarray.h"
 
 #include "wx/list.h"
 #include "wx/dynarray.h"
 

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 8532a749299e02b4ff9688152e193305d3161f91..ab80346bc0cc46501dadab0a139181c0681a5b1e 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -30,11 +30,8 @@
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
     #include "wx/toolbar.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
     #include "wx/toolbar.h"

-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR

     #include "wx/statusbr.h"
     #include "wx/statusbr.h"

-#endif
+#endif // WX_PRECOMP

 
 // ----------------------------------------------------------------------------
 // event table
 
 // ----------------------------------------------------------------------------
 // event table

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index e3a2a150667fb95e244f932eb74586964d24739a..8e51e041ba18122c3f83af81317459966ad85c05 100644 (file)
--- a/src/common/statbar.cpp
+++ b/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:
 // Purpose:     wxStatusBarBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

-    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_STATUSBAR
 #endif //WX_PRECOMP
 
 #if wxUSE_STATUSBAR


@@ -354,4 +355,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

-

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 5517573f79a2bfd38e0644931d219c484457f61a..bb1b36f5604b6b3cce375bef2602e076295769ad 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/settings.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/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
 // 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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index f13c3957bceafcc66675080f38b1d07cb1d58961..7683d527db656308c561db32dd264cc420bb75ff 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -27,11 +27,8 @@
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"

-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR

     #include "wx/statusbr.h"
     #include "wx/statusbr.h"

-#endif
+#endif // WX_PRECOMP

 
 #include <glib.h>
 #include "wx/gtk/private.h"
 
 #include <glib.h>
 #include "wx/gtk/private.h"

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8584ff8cafe83d3c3753a03a0e3a6ede790e8e6e..b7ab6c34c83d9618667897564e13a330a35ac30d 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -31,6 +31,7 @@
     #include "wx/toolbar.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"
     #include "wx/toolbar.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"

+    #include "wx/statusbr.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"


@@ -47,7 +48,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

-#include "wx/statusbr.h"

 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index b9818eba524410cef108d4e8a32a2650519cbd08..493ab611660ffa7e2a6bbcb75e7ce499938f1c3b 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -27,11 +27,8 @@
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"
     #include "wx/dialog.h"
     #include "wx/control.h"
     #include "wx/toolbar.h"

-#endif // WX_PRECOMP
-
-#if wxUSE_STATUSBAR

     #include "wx/statusbr.h"
     #include "wx/statusbr.h"

-#endif
+#endif // WX_PRECOMP

 
 #include <glib.h>
 #include "wx/gtk1/private.h"
 
 #include <glib.h>
 #include "wx/gtk1/private.h"

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 78ea9235acdf530751660ef45479174a41c43309..70742e619376d23aaf63f2f603f8e16498c48022 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -30,6 +30,7 @@
     #include "wx/textctrl.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"
     #include "wx/textctrl.h"
     #include "wx/combobox.h"
     #include "wx/layout.h"

+    #include "wx/statusbr.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"


@@ -46,7 +47,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

-#include "wx/statusbr.h"

 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 7469315094ad31c6d682427ed9397cb276ca38d5..f842f5bae81664e3464ea330e03e3d947bfde74e 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -20,9 +20,9 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/statusbr.h"

 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index e7557438b480ce47bf998f39441ee433b2d3d529..f93ae305b30b70067362a3cfce83addb269d886d 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -31,10 +31,10 @@
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
     #include "wx/layout.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
     #include "wx/layout.h"

+    #include "wx/statusbr.h"

 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"

-#include "wx/statusbr.h"

 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index 0cc1fec03e3474bafe52474a42f25053c7854f86..97fb4ed367f363874121d9afb88596cc33191c02 100644 (file)
--- a/src/mac/classic/frame.cpp
+++ b/src/mac/classic/frame.cpp
@@ -20,9 +20,9 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/statusbr.h"

 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"
 #include "wx/menuitem.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/statbrma.cpp b/src/mac/classic/statbrma.cpp
index f2a36929af5539d6d91583de1fc6f9801a8d9832..5bb50e0518eae68324a1ce1fa6bf3d62908745b4 100644 (file)
--- a/src/mac/classic/statbrma.cpp
+++ b/src/mac/classic/statbrma.cpp
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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),
 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 ;
 
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     rect.y=0;
     rect.height = m_height ;

-    Refresh( TRUE , &rect ) ;
+    Refresh( true , &rect ) ;

     Update();
 }
 
     Update();
 }
 


@@ -149,6 +152,6 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled )
 {
 
 void wxStatusBarMac::MacSuperEnabled( bool enabled )
 {

-    Refresh(FALSE) ;
+    Refresh(false) ;

     wxWindow::MacSuperEnabled( enabled ) ;
 }
     wxWindow::MacSuperEnabled( enabled ) ;
 }

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 1fd435f5675df4b0264f764eaf4d1db5500a4c24..47b675ade29a5d2d272e1bef01632e3a2560994a 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -30,12 +30,12 @@
     #include "wx/statbox.h"
     #include "wx/listbox.h"
     #include "wx/layout.h"
     #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"
 #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"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 35d67b0619ed0307e2b93e7107ba8ab4564b6e49..e734afa91021740aead0fb02b10cd80aa7c820a3 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -36,10 +36,9 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif
 
 #endif
 

-#include "wx/statusbr.h"
-

 #ifdef __VMS__
     #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
     #pragma message disable nosimpint
 #endif

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 55edcb689fb2ae98f6ca6b73a77d8055b25d06dd..42a71529a7e7a3b2c8b6b399e45824d9e9f41c9e 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -37,6 +37,7 @@
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"


@@ -50,10 +51,7 @@
     #include "wx/msw/winundef.h"
 #endif
 
     #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"
 
 
 #include "wx/menuitem.h"
 

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index cc017bff9986572047306c476d5b11db9f5887f7..399c30e7a456c833d3558a4e69d9bf7e7fbd5793 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -34,9 +34,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #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"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 8cb0816fa6bf22cfef787a9457778faec9ff7ff6..a9d14accca232ea3ec3c351597916214bbbc6b93 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -24,10 +24,8 @@
     #include "wx/icon.h"
     #include "wx/msgdlg.h"
     #include "wx/dcprint.h"
     #include "wx/icon.h"
     #include "wx/msgdlg.h"
     #include "wx/dcprint.h"

-#if wxUSE_STATUSBAR

     #include "wx/statusbr.h"
 #endif
     #include "wx/statusbr.h"
 #endif

-#endif

 
 #include "wx/module.h"
 
 
 #include "wx/module.h"
 


@@ -2729,12 +2727,10 @@ bool wxDC::DoBlit( wxCoord vXdest,
     return bSuccess;
 }
 
     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
 
     if(::DevQueryCaps( m_hDC
                       ,CAPS_FAMILY


@@ -2802,10 +2798,7 @@ wxSize wxDC::GetPPI() const
     return ppisize;
 } // end of wxDC::GetPPI
 
     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;
 {
     m_logicalScaleX = dX;
     m_logicalScaleY = dY;

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 2d312201142e24cd649d01c41f6632aac027af96..f08d1f2d8600f1b07f0029c0a7c8887bea262f1e 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -30,14 +30,12 @@
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/toolbar.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.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"
 
 
 #include "wx/menuitem.h"
 

diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp
index db49861dda35ec0ae733a612ff860141cc22f364..ad66236bf54dd1f4264bcd358c4002e0a16b132a 100644 (file)
--- a/src/palmos/frame.cpp
+++ b/src/palmos/frame.cpp
@@ -37,12 +37,10 @@
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/toolbar.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 #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"
 
 
 #include "wx/menuitem.h"
 

diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp
index ae2e3a2c04cce2bb8c7b0c6da8c01e362fa098db..23385f32ef643323076247075f0dfabf6c874fd7 100644 (file)
--- a/src/palmos/mdi.cpp
+++ b/src/palmos/mdi.cpp
@@ -34,9 +34,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #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"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 6773264e022a35c1038fcf2889e4d995eee2c739..3c4e447a3b83455a9e37acfb5efe4d3bf4dc0c9e 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/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:
 // Purpose:     wxStatusBar implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,12 +25,13 @@
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #endif
 
 #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"
 #include "wx/toplevel.h"
 
 #include "wx/univ/renderer.h"


@@ -327,4 +328,3 @@ int wxStatusBarUniv::GetBorderY() const
 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

-

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index e634adc9915f5adde4da006fe236df90ee8593c0..fc701a23f7933e5d54516df636a22f4842dd2bae 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -23,14 +23,13 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/statusbr.h"

 #endif
 
 #endif
 

-#include "wx/statusbr.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 

-wxStatusBarXmlHandler::wxStatusBarXmlHandler() :
-        wxXmlResourceHandler()
+wxStatusBarXmlHandler::wxStatusBarXmlHandler()
+                      :wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);
     AddWindowStyles();
 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);
     AddWindowStyles();