Remove duplicate fields in wxTextCtrl / wxTextEntry. Fixes #11618.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -147,14 +147,9 @@ protected:
|
|||||||
|
|
||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
|
|
||||||
bool m_editable;
|
|
||||||
|
|
||||||
// flag is set to true when the user edits the controls contents
|
// flag is set to true when the user edits the controls contents
|
||||||
bool m_dirty;
|
bool m_dirty;
|
||||||
|
|
||||||
// need to make this public because of the current implementation via callbacks
|
|
||||||
unsigned long m_maxLength;
|
|
||||||
|
|
||||||
virtual void EnableTextChangedEvents(bool enable)
|
virtual void EnableTextChangedEvents(bool enable)
|
||||||
{
|
{
|
||||||
m_triggerUpdateEvents = enable;
|
m_triggerUpdateEvents = enable;
|
||||||
|
@@ -32,7 +32,9 @@ class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
|
|||||||
{
|
{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxTextEntry()
|
wxTextEntry()
|
||||||
|
: m_editable(true),
|
||||||
|
m_maxLength(0)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
virtual ~wxTextEntry() {};
|
virtual ~wxTextEntry() {};
|
||||||
@@ -95,13 +97,6 @@ protected:
|
|||||||
// need to make this public because of the current implementation via callbacks
|
// need to make this public because of the current implementation via callbacks
|
||||||
unsigned long m_maxLength;
|
unsigned long m_maxLength;
|
||||||
|
|
||||||
virtual void EnableTextChangedEvents(bool enable)
|
|
||||||
{
|
|
||||||
m_triggerUpdateEvents = enable;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool m_triggerUpdateEvents ;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_OSX_TEXTENTRY_H_
|
#endif // _WX_OSX_TEXTENTRY_H_
|
||||||
|
@@ -75,10 +75,8 @@ END_EVENT_TABLE()
|
|||||||
|
|
||||||
void wxTextCtrl::Init()
|
void wxTextCtrl::Init()
|
||||||
{
|
{
|
||||||
m_editable = true ;
|
|
||||||
m_dirty = false;
|
m_dirty = false;
|
||||||
|
|
||||||
m_maxLength = 0;
|
|
||||||
m_privateContextMenu = NULL;
|
m_privateContextMenu = NULL;
|
||||||
m_triggerUpdateEvents = true ;
|
m_triggerUpdateEvents = true ;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user