setting clipping correctly

[wxWidgets.git] / src / cocoa / textctrl.mm

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index 02114484bab6156a5fe49d0c1dc246bf0dccbae2..d755334440dc98d2d1744b34a50c3e8cc6e77e49 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -1,18 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/textctrl.mm
+// Name:        src/cocoa/textctrl.mm

 // Purpose:     wxTextCtrl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxTextCtrl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/textctrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.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"


@@ -21,9 +24,12 @@
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>

+#import <AppKit/NSCell.h>
+
+#include <math.h>

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
 
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
 


@@ -41,7 +47,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
     m_cocoaNSView = NULL;
     SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     m_cocoaNSView = NULL;
     SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];

-    [GetNSTextField() setStringValue:[NSString stringWithCString:value.c_str()]];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(value)];
+

     [GetNSControl() sizeToFit];
     NSRect currentFrame = [m_cocoaNSView frame];
     if(currentFrame.size.width < 70)
     [GetNSControl() sizeToFit];
     NSRect currentFrame = [m_cocoaNSView frame];
     if(currentFrame.size.width < 70)


@@ -57,7 +64,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
 
 wxTextCtrl::~wxTextCtrl()
 {
 
 wxTextCtrl::~wxTextCtrl()
 {

-    DisassociateNSTextField(m_cocoaNSView);
+    DisassociateNSTextField(GetNSTextField());

 }
 
 void wxTextCtrl::Cocoa_didChangeText(void)
 }
 
 void wxTextCtrl::Cocoa_didChangeText(void)


@@ -72,6 +79,10 @@ void wxTextCtrl::SetEditable(bool)
 {
 }
 
 {
 }
 

+void wxTextCtrl::MarkDirty()
+{
+}
+

 void wxTextCtrl::DiscardEdits()
 {
 }
 void wxTextCtrl::DiscardEdits()
 {
 }


@@ -124,10 +135,13 @@ void wxTextCtrl::Replace(long, long, wxString const&)
 {
 }
 
 {
 }
 

-void wxTextCtrl::SetValue(wxString const& value)
+void wxTextCtrl::DoSetValue(wxString const& value, int flags)

 {
     wxAutoNSAutoreleasePool pool;
     [GetNSTextField() setStringValue: wxNSStringWithWxString(value)];
 {
     wxAutoNSAutoreleasePool pool;
     [GetNSTextField() setStringValue: wxNSStringWithWxString(value)];

+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 void wxTextCtrl::WriteText(wxString const&)
 }
 
 void wxTextCtrl::WriteText(wxString const&)


@@ -168,7 +182,7 @@ int wxTextCtrl::GetLineLength(long) const
     return 0;
 }
 
     return 0;
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

 {
     return 0;
 }
 {
     return 0;
 }


@@ -196,6 +210,18 @@ bool wxTextCtrl::CanUndo() const
 wxString wxTextCtrl::GetValue() const
 {
     wxAutoNSAutoreleasePool pool;
 wxString wxTextCtrl::GetValue() const
 {
     wxAutoNSAutoreleasePool pool;

-    return wxString([[GetNSTextField() stringValue] lossyCString]);
+    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)ceil(cellSize.height));
+
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
+    return size;
+}