Set initial window size as its minimal size.

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

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index df6967f9abcfe68cf2c9ca85547e6fdfc69a6003..c7c934144af23dafb2003a5666cc50e33eb83999 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -63,7 +63,6 @@ public:
 
     // accessors
     // ---------
 
     // accessors
     // ---------

-    virtual wxString GetValue() const;

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;


@@ -80,7 +79,6 @@ public:
 
     // editing
     virtual void Clear();
 
     // editing
     virtual void Clear();

-    virtual void Replace(long from, long to, const wxString& value);

     virtual void Remove(long from, long to);
 
     // sets/clears the dirty flag
     virtual void Remove(long from, long to);
 
     // sets/clears the dirty flag


@@ -95,13 +93,13 @@ public:
     // methods apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
     virtual bool SetFont( const wxFont &font );
     // methods apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
     virtual bool SetFont( const wxFont &font );

+    virtual bool GetStyle(long position, wxTextAttr& style);

     virtual bool SetStyle(long start, long end, const wxTextAttr& style);
     virtual bool SetDefaultStyle(const wxTextAttr& style);
 
     // writing text inserts it at the current position;
     // appending always inserts it at the end
     virtual void WriteText(const wxString& text);
     virtual bool SetStyle(long start, long end, const wxTextAttr& style);
     virtual bool SetDefaultStyle(const wxTextAttr& style);
 
     // writing text inserts it at the current position;
     // appending always inserts it at the end
     virtual void WriteText(const wxString& text);

-    virtual void AppendText(const wxString& text);

 
     // translate between the position (which is just an index into the textctrl
     // considering all its contents as a single strings) and (x, y) coordinates
 
     // translate between the position (which is just an index into the textctrl
     // considering all its contents as a single strings) and (x, y) coordinates


@@ -177,7 +175,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

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

 
     bool  m_editable;
 
 
     bool  m_editable;
 


@@ -187,17 +185,12 @@ 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
+    virtual void EnableTextChangedEvents(bool enable)

     {
     {

-        return m_triggerOnSetValue;
+        m_triggerUpdateEvents = enable;

     }
 
     }
 

-    void SetTriggerOnSetValue(bool trigger)
-    {
-        m_triggerOnSetValue = trigger;
-    }
-
-    bool m_triggerOnSetValue ;
+    bool m_triggerUpdateEvents ;

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