diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 3d460ea68c..0df18e0c92 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -571,7 +571,7 @@ public: Note that if SetWindow() had been called with an object not deriving from wxControl, this method will return @NULL. */ - wxControl* GetControl() const; + wxControl* GetControl(); /** Set the wxControl that will be used by this cell editor for editing the diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h index 6e5ca6b7a4..75bd9dc681 100644 --- a/interface/wx/scrolwin.h +++ b/interface/wx/scrolwin.h @@ -581,6 +581,7 @@ public: */ virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const; +protected: /** This method can be overridden in a derived class to prevent scrolling the child window into view automatically when it gets focus. @@ -593,9 +594,8 @@ public: @since 3.1.3 */ - virtual bool ShouldScrollToChildOnFocus(wxWindow* child) + virtual bool ShouldScrollToChildOnFocus(wxWindow* child); -protected: /** Function which must be overridden to implement the size available for the scroll target for the given size of the main window. diff --git a/interface/wx/timer.h b/interface/wx/timer.h index d0a884c7b7..d23f1b726e 100644 --- a/interface/wx/timer.h +++ b/interface/wx/timer.h @@ -208,7 +208,6 @@ public: class wxTimerEvent : public wxEvent { public: - wxTimerEvent(); wxTimerEvent(wxTimer& timer); /**