Fixed bug: wxPropertyGrid::Thaw() should no longer move the scroll bar when reselecti...

[wxWidgets.git] / include / wx / osx / cocoa / private / textimpl.h

diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h
index d052ea8df7de863d0b9ed718f93d0ffa73ab5c3a..b405b19b1cc9aaf08cd9e89c7ac74cee4cd5441c 100644 (file)
--- a/include/wx/osx/cocoa/private/textimpl.h
+++ b/include/wx/osx/cocoa/private/textimpl.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,14 +14,14 @@
 
 #include "wx/osx/private.h"
 
-// implementation exposed, so that search control can pull it 
+// implementation exposed, so that search control can pull it
 
 class wxNSTextFieldControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl
 {
 public :
     wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w );
     virtual ~wxNSTextFieldControl();
-    
+
     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str) ;
     virtual void Copy() ;
@@ -32,6 +32,35 @@ public :
     virtual void GetSelection( long* from, long* to) const ;
     virtual void SetSelection( long from , long to );
     virtual void WriteText(const wxString& str) ;
+
+    virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
+protected :
+    NSTextField* m_textField;
+    long m_selStart;
+    long m_selEnd;
+};
+
+class wxNSTextViewControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl
+{
+public:
+    wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w );
+    virtual ~wxNSTextViewControl();
+
+    virtual wxString GetStringValue() const ;
+    virtual void SetStringValue( const wxString &str) ;
+    virtual void Copy() ;
+    virtual void Cut() ;
+    virtual void Paste() ;
+    virtual bool CanPaste() const ;
+    virtual void SetEditable(bool editable) ;
+    virtual void GetSelection( long* from, long* to) const ;
+    virtual void SetSelection( long from , long to );
+    virtual void WriteText(const wxString& str) ;
+    virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
+
+protected:
+    NSScrollView* m_scrollView;
+    NSTextView* m_textView;
 };
 
 #endif // _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_