Make m_inDoPropertyChanged and m_inCommitChangesFromEditor bools; Manage m_inDoProper...

[wxWidgets.git] / include / wx / osx / textctrl.h

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 762bf34a18b1903c4a9e5d1bca643f2a6b9e8709..1116b4def81556ef8e2da849149e5ed2738c6bd4 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -26,9 +26,6 @@
 #include "wx/control.h"
 #include "wx/textctrl.h"
 
-// forward decl for wxListWidgetImpl implementation type.
-class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl;
-
 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
@@ -99,13 +96,10 @@ public:
     virtual void ShowPosition(long pos);
 
     // overrides so that we can send text updated events
+    virtual void Copy();
     virtual void Cut();
     virtual void Paste();
     
-    virtual void WriteText(const wxString& text);
-    virtual void Clear();
-    virtual void Remove(long from, long to);
-
     // Implementation
     // --------------
     virtual void Command(wxCommandEvent& event);
@@ -141,7 +135,6 @@ public:
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 
-    virtual wxTextWidgetImpl * GetTextPeer() const;
 protected:
     // common part of all ctors
     void Init();
@@ -151,17 +144,16 @@ protected:
     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 
-    virtual void EnableTextChangedEvents(bool enable)
+    virtual void EnableTextChangedEvents(bool WXUNUSED(enable))
     {
-        m_triggerUpdateEvents = enable;
+        // nothing to do here as the events are never generated when we change
+        // the controls value programmatically anyhow
     }
 
-    bool m_triggerUpdateEvents ;
-
 private :
-  wxMenu  *m_privateContextMenu;
+    wxMenu  *m_privateContextMenu;
 
-  DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // _WX_TEXTCTRL_H_