X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51478cd68dc4b44b7ef0f497de81bff8601b6414..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/textctrl.h

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index 595c3d1f8d..1818f2d602 100644
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -47,7 +47,7 @@ public:
         Create(parent, id, value, pos, size, style, validator, name);
     }
 
-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
         wxWindowID id,
@@ -61,7 +61,6 @@ public:
     // accessors
     // ---------
     virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
@@ -81,9 +80,6 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
-    // load the controls contents from the file
-    virtual bool LoadFile(const wxString& file);
-
     // sets/clears the dirty flag
     virtual void MarkDirty();
     virtual void DiscardEdits();
@@ -188,13 +184,15 @@ public:
 
     wxMacTextControl * GetPeer() const
     { return (wxMacTextControl*) m_peer; }
-    
+
 protected:
     // common part of all ctors
     void Init();
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+
     bool  m_editable;
 
     // flag is set to true when the user edits the controls contents
@@ -202,17 +200,17 @@ protected:
 
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
-    
-    bool GetTriggerOnSetValue() const 
-    { 
-        return m_triggerOnSetValue; 
+
+    bool GetTriggerOnSetValue() const
+    {
+        return m_triggerOnSetValue;
     }
-    
-    void SetTriggerOnSetValue(bool trigger) 
-    { 
-        m_triggerOnSetValue = trigger; 
+
+    void SetTriggerOnSetValue(bool trigger)
+    {
+        m_triggerOnSetValue = trigger;
     }
-    
+
     bool m_triggerOnSetValue ;
 
 private :