From 3f33ecc77311ba7f4d815e21b1746dcf00c52dae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 25 Oct 2015 18:20:32 +0100 Subject: [PATCH] No changes, just remove redundant "inline" from wxOSX headers There is no need for them in the methods declared in the class declaration anyhow, so just remove them. No real changes. --- include/wx/osx/gauge.h | 4 ++-- include/wx/osx/minifram.h | 4 ++-- include/wx/osx/radiobox.h | 8 ++++---- include/wx/osx/radiobut.h | 10 +++++----- include/wx/osx/slider.h | 8 ++++---- include/wx/osx/statbox.h | 4 ++-- include/wx/osx/toolbar.h | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h index 9344b95766..cfd9ff5ce4 100644 --- a/include/wx/osx/gauge.h +++ b/include/wx/osx/gauge.h @@ -17,9 +17,9 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: - inline wxGauge() { } + wxGauge() { } - inline wxGauge(wxWindow *parent, wxWindowID id, + wxGauge(wxWindow *parent, wxWindowID id, int range, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h index 00e4c6e124..a4180f975e 100644 --- a/include/wx/osx/minifram.h +++ b/include/wx/osx/minifram.h @@ -20,8 +20,8 @@ class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { wxDECLARE_DYNAMIC_CLASS(wxMiniFrame); public: - inline wxMiniFrame() {} - inline wxMiniFrame(wxWindow *parent, + wxMiniFrame() {} + wxMiniFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index 42cba23423..e340745f06 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase public: // Constructors & destructor wxRadioBox(); - inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, + wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, int majorDim = 0, long style = wxRA_SPECIFY_COLS, @@ -30,7 +30,7 @@ public: { Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name); } - inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, + wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const wxArrayString& choices, int majorDim = 0, long style = wxRA_SPECIFY_COLS, @@ -82,8 +82,8 @@ public: void SetFocus(); // Other variable access functions - inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } - inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } + int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } + void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } void OnRadioButton( wxCommandEvent& event ) ; diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h index 8b91711c2b..714d1984e9 100644 --- a/include/wx/osx/radiobut.h +++ b/include/wx/osx/radiobut.h @@ -16,8 +16,8 @@ class WXDLLIMPEXP_CORE wxRadioButton: public wxControl wxDECLARE_DYNAMIC_CLASS(wxRadioButton); public: - inline wxRadioButton() {} - inline wxRadioButton(wxWindow *parent, wxWindowID id, + wxRadioButton() {} + wxRadioButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -43,7 +43,7 @@ public: void Command(wxCommandEvent& event); wxRadioButton *AddInCycle(wxRadioButton *cycle); void RemoveFromCycle(); - inline wxRadioButton *NextInCycle() {return m_cycle;} + wxRadioButton *NextInCycle() {return m_cycle;} // osx specific event handling common for all osx-ports @@ -65,8 +65,8 @@ class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton protected: wxBitmap *theButtonBitmap; public: - inline wxBitmapRadioButton() { theButtonBitmap = NULL; } - inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id, + wxBitmapRadioButton() { theButtonBitmap = NULL; } + wxBitmapRadioButton(wxWindow *parent, wxWindowID id, const wxBitmap *label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index 4b58671c42..995315e836 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase public: wxSlider(); - inline wxSlider(wxWindow *parent, wxWindowID id, + wxSlider(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -49,14 +49,14 @@ public: void SetRange(int minValue, int maxValue); - inline int GetMin() const { return m_rangeMin; } - inline int GetMax() const { return m_rangeMax; } + int GetMin() const { return m_rangeMin; } + int GetMax() const { return m_rangeMax; } void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } // For trackbars only - inline int GetTickFreq() const { return m_tickFreq; } + int GetTickFreq() const { return m_tickFreq; } void SetPageSize(int pageSize); int GetPageSize() const ; void ClearSel() ; diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h index c7a02c6bc2..981d2c3fdb 100644 --- a/include/wx/osx/statbox.h +++ b/include/wx/osx/statbox.h @@ -16,8 +16,8 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase wxDECLARE_DYNAMIC_CLASS(wxStaticBox); public: - inline wxStaticBox() {} - inline wxStaticBox(wxWindow *parent, wxWindowID id, + wxStaticBox() {} + wxStaticBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h index 3c8ae1bab4..3efd810467 100644 --- a/include/wx/osx/toolbar.h +++ b/include/wx/osx/toolbar.h @@ -26,7 +26,7 @@ public: wxToolBar() { Init(); } - inline wxToolBar(wxWindow *parent, wxWindowID id, + wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTB_DEFAULT_STYLE, const wxString& name = wxToolBarNameStr)