Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h
index 5d7f07bcebbc4c30b369b64168a4e98f23119c5b..51bf090d2a25449497bc963de23cac7cec541ae7 100644 (file)
--- a/include/wx/osx/cocoa/private/textimpl.h
+++ b/include/wx/osx/cocoa/private/textimpl.h
@@ -62,6 +62,7 @@ public:
     virtual void SetStyle(long start, long end, const wxTextAttr& style);
     
     virtual void CheckSpelling(bool check);
     virtual void SetStyle(long start, long end, const wxTextAttr& style);
     
     virtual void CheckSpelling(bool check);

+    virtual wxSize GetBestSize() const;

 
 protected:
     NSScrollView* m_scrollView;
 
 protected:
     NSScrollView* m_scrollView;

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 47c9179bf388eca7682fa4dd09c9e964751664c3..5cb0e3688ab1c0b4117886dfb892836ff9b0eec3 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -586,6 +586,8 @@ public :
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }

+    
+    virtual wxSize GetBestSize() const { return wxDefaultSize; }

 };
 
 //
 };
 
 //

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 63a2515307fd2630ddedfaf503e2155748d582bb..9dbb445eed3d256b7779859ed9f22ade7f86a6e9 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -514,6 +514,18 @@ void wxNSTextViewControl::CheckSpelling(bool check)
         [m_textView setContinuousSpellCheckingEnabled: check];
 }
 
         [m_textView setContinuousSpellCheckingEnabled: check];
 }
 

+wxSize wxNSTextViewControl::GetBestSize() const
+{
+    if (m_textView && [m_textView layoutManager])
+    {
+        NSRect rect = [[m_textView layoutManager] usedRectForTextContainer: [m_textView textContainer]];
+        wxSize size = wxSize(rect.size.width, rect.size.height);
+        size.x += [m_textView textContainerInset].width;
+        size.y += [m_textView textContainerInset].height;
+        return size;
+    }
+}
+

 // wxNSTextFieldControl
 
 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
 // wxNSTextFieldControl
 
 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 6edd282e97b83ec4339ba51db7a97f455252569d..ae3328808aa9aa6fb609aac8148668cab16c6b6e 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -190,7 +190,8 @@ bool wxTextCtrl::SetFont( const wxFont& font )
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {

-    GetTextPeer()->SetStyle( start , end , style ) ;
+    if (GetTextPeer())
+        GetTextPeer()->SetStyle( start , end , style ) ;

 
     return true ;
 }
 
     return true ;
 }


@@ -337,6 +338,13 @@ bool wxTextCtrl::AcceptsFocus() const
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {

+    if (GetTextPeer())
+    {
+        wxSize size = GetTextPeer()->GetBestSize();
+        if (size.x > 0 && size.y > 0)
+            return size;
+    }
+    

     int wText, hText;
 
     // these are the numbers from the HIG:
     int wText, hText;
 
     // these are the numbers from the HIG:


@@ -826,7 +834,11 @@ int wxTextWidgetImpl::GetNumberOfLines() const
 
     for (size_t i = 0; i < content.length() ; i++)
     {
 
     for (size_t i = 0; i < content.length() ; i++)
     {

+#if wxOSX_USE_COCOA
+        if (content[i] == '\n')
+#else

         if (content[i] == '\r')
         if (content[i] == '\r')

+#endif

             lines++;
     }
 
             lines++;
     }