changing the Multiple Inheritance along the Single Inheritance, patch 1623801

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

diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h
index abca3292dbe9ff3675547effaa674e989b63206c..4adacb081e1126f04a024d47918a28645aeb2b58 100644 (file)
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TEXTCTRL_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TEXTCTRL_H__


@@ -55,7 +55,6 @@ protected:
 // ------------------------------------------------------------------------
 public:
     virtual wxString GetValue() const;
 // ------------------------------------------------------------------------
 public:
     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;


@@ -108,7 +107,7 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

 
     virtual void SetSelection(long from, long to);
 //    virtual void SelectAll();
 
     virtual void SetSelection(long from, long to);
 //    virtual void SelectAll();


@@ -116,6 +115,8 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+
+    virtual void DoSetValue(const wxString& value, int flags = 0);

 };
 
 #endif // __WX_COCOA_TEXTCTRL_H__
 };
 
 #endif // __WX_COCOA_TEXTCTRL_H__