X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3966a9f4f8001df66aa0fcb347911f9fdade00dc..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/mac/carbon/textctrl.h diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h index 69615247a2..0c0bb75464 100644 --- a/include/wx/mac/carbon/textctrl.h +++ b/include/wx/mac/carbon/textctrl.h @@ -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,10 +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); - virtual bool LoadFile(const wxString& file, int WXUNUSED(fileType)) { return LoadFile(file); } - // sets/clears the dirty flag virtual void MarkDirty(); virtual void DiscardEdits(); @@ -175,6 +170,7 @@ public: virtual void MacVisibilityChanged(); virtual void MacEnabledStateChanged(); virtual void MacSuperChangedPosition(); + virtual void MacCheckSpelling(bool check); #ifndef __WXMAC_OSX__ virtual void MacControlUserPaneDrawProc(wxInt16 part); @@ -189,13 +185,17 @@ public: wxMacTextControl * GetPeer() const { return (wxMacTextControl*) m_peer; } - + protected: // common part of all ctors void Init(); virtual wxSize DoGetBestSize() const; + virtual void CreatePeer(const wxString& str, const wxPoint& pos, const wxSize& size, long style ); + + virtual void DoSetValue(const wxString& value, int flags = 0); + bool m_editable; // flag is set to true when the user edits the controls contents @@ -203,17 +203,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 :