make access specifiers for the virtual functions match their access in the base class (patch 1400131)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,13 +196,17 @@ public:
|
||||
// called HideNativeCaret() before
|
||||
void OnSetFocus(wxFocusEvent& event);
|
||||
|
||||
// intercept WM_GETDLGCODE
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// intercept WM_GETDLGCODE
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
// return true if this control has a user-set limit on amount of text (i.e.
|
||||
// the limit is due to a previous call to SetMaxLength() and not built in)
|
||||
bool HasSpaceLimit(unsigned int *len) const;
|
||||
@@ -240,12 +244,8 @@ protected:
|
||||
// send TEXT_UPDATED event, return true if it was handled, false otherwise
|
||||
bool SendUpdateEvent();
|
||||
|
||||
// override some base class virtuals
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// we're using RICHEDIT (and not simple EDIT) control if this field is not
|
||||
// 0, it also gives the version of the RICHEDIT control being used (1, 2 or
|
||||
@@ -257,8 +257,6 @@ protected:
|
||||
// text ourselves: we want this to be exactly 1
|
||||
int m_updatesCount;
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const;
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
|
||||
|
Reference in New Issue
Block a user