cleanup

[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 f77e41423a1ddfc0f269c42626e89f32bf6333d1..acc52b5b3c2c514bfa25bea8837204ada6cda0ae 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -18,6 +18,9 @@
     // has more features (backgrounds etc.), but may show redraw artefacts and other
     // problems depending on your usage; hence, the default is 'false'.
     #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
     // has more features (backgrounds etc.), but may show redraw artefacts and other
     // problems depending on your usage; hence, the default is 'false'.
     #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")

+    // set this to 'true' if you want editable text controls to have spell checking turned
+    // on by default, you can change this setting individually on a control using MacCheckSpelling
+    #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker")

 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"


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

-    virtual void SetValue(const wxString& value);
-
-    virtual void ChangeValue(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;


@@ -173,27 +173,21 @@ public:
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();

-
-#ifndef __WXMAC_OSX__
-    virtual void MacControlUserPaneDrawProc(wxInt16 part);
-    virtual wxInt16 MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y);
-    virtual wxInt16 MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc);
-    virtual void MacControlUserPaneIdleProc();
-    virtual wxInt16 MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers);
-    virtual void MacControlUserPaneActivateProc(bool activating);
-    virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action);
-    virtual void MacControlUserPaneBackgroundProc(void* info);
-#endif
+    virtual void MacCheckSpelling(bool check);

 
     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


@@ -201,17 +195,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 :