Make DoGetBestSize() always return a width of 100

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

diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h
index 322fb99b48dd3d892e19b962447f36d207e4f228..abca3292dbe9ff3675547effaa674e989b63206c 100644 (file)
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -114,6 +114,8 @@ public:
 //    virtual void SelectAll();
     virtual void SetEditable(bool editable);
 
 //    virtual void SelectAll();
     virtual void SetEditable(bool editable);
 

+protected:
+    virtual wxSize DoGetBestSize() const;

 };
 
 #endif // __WX_COCOA_TEXTCTRL_H__
 };
 
 #endif // __WX_COCOA_TEXTCTRL_H__

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index 6ead7fdd43e175125196f043b083a02fe8b6a5b4..5028866515504efa92d85f21dd772840db1e205e 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -13,6 +13,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/textctrl.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/textctrl.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"


@@ -22,6 +23,8 @@
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
 

+#include <math.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 END_EVENT_TABLE()


@@ -204,3 +207,16 @@ wxString wxTextCtrl::GetValue() const
     return wxStringWithNSString([GetNSTextField() stringValue]);
 }
 
     return wxStringWithNSString([GetNSTextField() stringValue]);
 }
 

+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    wxAutoNSAutoreleasePool pool;
+    wxASSERT(GetNSControl());
+    NSCell *cell = [GetNSControl() cell];
+    wxASSERT(cell);
+    NSSize cellSize = [cell cellSize];
+    wxSize size(100,(int)ceilf(cellSize.height));
+
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
+    return size;
+}
+