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

Put wxDECLARE_EVENT_TABLE at the end of wxTextCtrl declaration

Browse Source 
This fixes the access specifier effectively used for the members
following these macros, as it's changed to "public" inside them, meaning
that e.g. m_privateContextMenu was actually public even though it was
ostensibly declared in the private section and the intention was for it
to be private.

Closes #16038.
This commit is contained in:
jbbbms
2018-11-10 23:37:33 +01:00
committed by Vadim Zeitlin
parent c252ececda
commit 87195cf3ea
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/textctrl.h
View File

@@ -290,9 +290,6 @@ private:
// false if we hit the limit set by SetMaxLength() and so didn't change it. // false if we hit the limit set by SetMaxLength() and so didn't change it.
bool AdjustSpaceLimit(); bool AdjustSpaceLimit();
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl);
wxMenu* m_privateContextMenu; wxMenu* m_privateContextMenu;
bool m_isNativeCaretShown; bool m_isNativeCaretShown;
@@ -301,6 +298,8 @@ private:
int m_isInkEdit; int m_isInkEdit;
#endif #endif
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl);
}; };
#endif // _WX_TEXTCTRL_H_ #endif // _WX_TEXTCTRL_H_