use explicit virtual keyword with overridden virtual methods

[wxWidgets.git] / include / wx / mac / carbon / textctrl.h

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index a4a6dffdb27946052d2f9d7f572ca125c73f781a..1818f2d602a97883587a7196d2f8781168ac464f 100644 (file)
--- 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);
     }
 
         Create(parent, id, value, pos, size, style, validator, name);
     }
 

-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();

 
     bool Create(wxWindow *parent,
         wxWindowID id,
 
     bool Create(wxWindow *parent,
         wxWindowID id,


@@ -61,7 +61,6 @@ public:
     // accessors
     // ---------
     virtual wxString GetValue() const;
     // accessors
     // ---------
     virtual wxString GetValue() const;

-    virtual void SetValue(const wxString& value);

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
 
     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);
 
     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();
     // sets/clears the dirty flag
     virtual void MarkDirty();
     virtual void DiscardEdits();


@@ -195,6 +191,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     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
     bool  m_editable;
 
     // flag is set to true when the user edits the controls contents


@@ -203,6 +201,18 @@ protected:
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
 
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
 

+    bool GetTriggerOnSetValue() const
+    {
+        return m_triggerOnSetValue;
+    }
+
+    void SetTriggerOnSetValue(bool trigger)
+    {
+        m_triggerOnSetValue = trigger;
+    }
+
+    bool m_triggerOnSetValue ;
+

 private :
   wxMenu  *m_privateContextMenu;
 
 private :
   wxMenu  *m_privateContextMenu;