From 330043b46d2d7fc6ff855f0073ad33d3d637a289 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Jul 1998 22:09:37 +0000 Subject: [PATCH] a couple of "const" mistakenly removed restored git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/statusbr.h | 14 +++++++------- src/generic/statusbr.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index 784a03a288..ce2d4ae642 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -35,7 +35,7 @@ public: Create(parent, id, pos, size, style, name); } - ~wxStatusBar(void); + ~wxStatusBar(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -44,15 +44,15 @@ public: const wxString& name = wxPanelNameStr); // Create status line - virtual void SetFieldsCount(int number=1, int *widths = NULL); - inline int GetFieldsCount(void) const { return m_nFields; } + virtual void SetFieldsCount(int number=1, const int widths[] = NULL); + inline int GetFieldsCount() const { return m_nFields; } // 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, int *widths_field); + virtual void SetStatusWidths(int n, const int widths_field[]); virtual void DrawFieldText(wxDC& dc, int i); virtual void DrawField(wxDC& dc, int i); @@ -60,8 +60,8 @@ public: // Get the position and size of the field's internal bounding rectangle virtual bool GetFieldRect(int i, wxRectangle& rect) const; - inline int GetBorderX(void) const { return m_borderX; } - inline int GetBorderY(void) const { return m_borderY; } + inline int GetBorderX() const { return m_borderX; } + inline int GetBorderY() const { return m_borderY; } inline void SetBorderX(int x); inline void SetBorderY(int y); @@ -70,7 +70,7 @@ public: void OnPaint(wxPaintEvent& event); - virtual void InitColours(void); + virtual void InitColours(); // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index d78787b1e9..0688f16c7d 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -94,7 +94,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id, return success; } -void wxStatusBar::SetFieldsCount(int number, int *widths) +void wxStatusBar::SetFieldsCount(int number, const int *widths) { m_nFields = number; @@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(int n) const return m_statusStrings[n]; } -void wxStatusBar::SetStatusWidths(int n, int *widths_field) +void wxStatusBar::SetStatusWidths(int n, const int *widths_field) { // only set status widths, when n == number of statuswindows if (n == m_nFields) -- 2.45.2