copied and pasted 2.8.9 change log section (was there anything there that didn't...

[wxWidgets.git] / src / osx / carbon / textctrl.cpp

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index fc47348ff9dc3690637f17a198e0df0ec7cded43..b30b691016d745eccc2aba48b0ae5788822fd617 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -223,6 +223,10 @@ class wxMacMLTEControl : public wxMacControl, public wxTextWidgetImpl
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}

+    
+    virtual bool        CanFocus() const
+                        { return true; }
+

     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str ) ;
 
     virtual wxString GetStringValue() const ;
     virtual void SetStringValue( const wxString &str ) ;
 


@@ -290,7 +294,7 @@ public :
                              const wxSize& size, long style ) ;
     virtual ~wxMacMLTEHIViewControl() ;
 
                              const wxSize& size, long style ) ;
     virtual ~wxMacMLTEHIViewControl() ;
 

-    virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
+    virtual bool SetFocus() ;

     virtual bool HasFocus() const ;
     virtual void SetBackgroundColour(const wxColour& col ) ;
 
     virtual bool HasFocus() const ;
     virtual void SetBackgroundColour(const wxColour& col ) ;
 


@@ -2248,9 +2252,9 @@ wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
 {
 }
 
 {
 }
 

-OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
+bool wxMacMLTEHIViewControl::SetFocus()

 {
 {

-    return SetKeyboardFocus( GetControlOwner( m_textView ), m_textView, focusPart ) ;
+    return SetKeyboardFocus( GetControlOwner( m_textView ), m_textView, kControlFocusNextPart ) == noErr ;

 }
 
 bool wxMacMLTEHIViewControl::HasFocus() const
 }
 
 bool wxMacMLTEHIViewControl::HasFocus() const