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

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index aa010f84c19f9bd1010eabfcfd5146b5500eed25..3bd9c978a20df08ae7810132885a2116fb11157e 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -147,14 +147,9 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    bool  m_editable;
-
     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 
-  // need to make this public because of the current implementation via callbacks
-    unsigned long  m_maxLength;
-
     virtual void EnableTextChangedEvents(bool enable)
     {
         m_triggerUpdateEvents = enable;

diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h
index 14ab4a0f670ba9e5c090c8409137e0c91fee4012..c55523830b7a956d4260dd96783b248c7adb24bb 100644 (file)
--- a/include/wx/osx/textentry.h
+++ b/include/wx/osx/textentry.h
@@ -32,7 +32,9 @@ class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
 {
 
 public:
-    wxTextEntry()
+    wxTextEntry() 
+        : m_editable(true),
+          m_maxLength(0)
     { }
     
     virtual ~wxTextEntry() {};
@@ -95,13 +97,6 @@ protected:
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
 
-    virtual void EnableTextChangedEvents(bool enable)
-    {
-        m_triggerUpdateEvents = enable;
-    }
-
-    bool m_triggerUpdateEvents ;
-
 };
 
 #endif // _WX_OSX_TEXTENTRY_H_

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 5bef77a56d936aa367aa412252ac3f04ee45e359..5d243607e0c9a0d62156e9370b9d3ed55f3f03e6 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -75,10 +75,8 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
-    m_editable = true ;
     m_dirty = false;
 
-    m_maxLength = 0;
     m_privateContextMenu = NULL;
     m_triggerUpdateEvents = true ;
 }