Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

[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 595c3d1f8d874b944bdeb2033c61206ee8460cb1..0c0bb754641d7c098c4c87ce9811980a5e581da6 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();


@@ -174,6 +170,7 @@ public:
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();

+    virtual void MacCheckSpelling(bool check);

 
 #ifndef __WXMAC_OSX__
     virtual void MacControlUserPaneDrawProc(wxInt16 part);
 
 #ifndef __WXMAC_OSX__
     virtual void MacControlUserPaneDrawProc(wxInt16 part);


@@ -188,13 +185,17 @@ public:
 
     wxMacTextControl * GetPeer() const
     { return (wxMacTextControl*) m_peer; }
 
     wxMacTextControl * GetPeer() const
     { return (wxMacTextControl*) m_peer; }

-    
+

 protected:
     // common part of all ctors
     void Init();
 
     virtual wxSize DoGetBestSize() const;
 
 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
     bool  m_editable;
 
     // flag is set to true when the user edits the controls contents


@@ -202,17 +203,17 @@ 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; 
+
+    bool GetTriggerOnSetValue() const
+    {
+        return m_triggerOnSetValue;

     }
     }

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

     }
     }

-    
+

     bool m_triggerOnSetValue ;
 
 private :
     bool m_triggerOnSetValue ;
 
 private :