Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a couple of "const" mistakenly removed restored

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-08 22:09:37 +00:00
parent 4d1f281b6d
commit 330043b46d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/generic/statusbr.h
View File

@@ -35,7 +35,7 @@ public:
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
} }
~wxStatusBar(void); ~wxStatusBar();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -44,15 +44,15 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// Create status line // Create status line
virtual void SetFieldsCount(int number=1, int *widths = NULL); virtual void SetFieldsCount(int number=1, const int widths[] = NULL);
inline int GetFieldsCount(void) const { return m_nFields; } inline int GetFieldsCount() const { return m_nFields; }
// Set status line text // Set status line text
virtual void SetStatusText(const wxString& text, int number = 0); virtual void SetStatusText(const wxString& text, int number = 0);
virtual wxString GetStatusText(int number = 0) const; virtual wxString GetStatusText(int number = 0) const;
// Set status line widths // 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 DrawFieldText(wxDC& dc, int i);
virtual void DrawField(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 // Get the position and size of the field's internal bounding rectangle
virtual bool GetFieldRect(int i, wxRectangle& rect) const; virtual bool GetFieldRect(int i, wxRectangle& rect) const;
inline int GetBorderX(void) const { return m_borderX; } inline int GetBorderX() const { return m_borderX; }
inline int GetBorderY(void) const { return m_borderY; } inline int GetBorderY() const { return m_borderY; }
inline void SetBorderX(int x); inline void SetBorderX(int x);
inline void SetBorderY(int y); inline void SetBorderY(int y);
@@ -70,7 +70,7 @@ public:
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
virtual void InitColours(void); virtual void InitColours();
// Responds to colour changes // Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);

4
src/generic/statusbr.cpp
View File

@@ -94,7 +94,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
return success; return success;
} }
void wxStatusBar::SetFieldsCount(int number, int *widths) void wxStatusBar::SetFieldsCount(int number, const int *widths)
{ {
m_nFields = number; m_nFields = number;
@@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(int n) const
return m_statusStrings[n]; 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 // only set status widths, when n == number of statuswindows
if (n == m_nFields) if (n == m_nFields)