bring in the definition of wxSizer, making non-precomp builds working again after...

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

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index b5c896241eaf590a0caee82d4954eb8fd45db5fb..3e5b8d87e79d5b7fd771bde8bfee1d3e2fc88d82 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -51,27 +51,66 @@
 
 @implementation wxNSTextField
 
 
 @implementation wxNSTextField
 

-- (void)setImplementation: (wxWidgetImpl *) theImplementation
+WXCOCOAIMPL_COMMON_IMPLEMENTATION
+
+- (id)initWithFrame:(NSRect)frame

 {
 {

-    impl = theImplementation;
+    [super initWithFrame:frame];
+    impl = NULL;
+    [self setDelegate: self];
+    [self setTarget: self];
+//    [self setAction: @selector(enterAction:)];
+    return self;

 }
 
 }
 

-- (wxWidgetImpl*) implementation
+// use our common calls
+- (void) setTitle:(NSString *) title

 {
 {

-    return impl;
+    [self setStringValue: title];

 }
 }

-
-- (BOOL) isFlipped
+/*
+- (void)controlTextDidChange:(NSNotification *)aNotification

 {
 {

-    return YES;
+    if ( impl )
+    {
+        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+        if ( wxpeer ) {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+            event.SetEventObject( wxpeer );
+            event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
+            wxpeer->HandleWindowEvent( event );
+        }
+    }

 }
 
 }
 

-// use our common calls
-- (void) setTitle:(NSString *) title
+- (void)controlTextDidEndEditing:(NSNotification *)aNotification

 {
 {

-    [self setStringValue: title];
+    if ( impl )
+    {
+        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+        if ( wxpeer ) {
+            wxFocusEvent event(wxEVT_KILL_FOCUS, wxpeer->GetId());
+            event.SetEventObject( wxpeer );
+            event.SetWindow( wxpeer );
+            wxpeer->HandleWindowEvent( event );
+        }
+    }

 }
 
 }
 

+- (void) enterAction: (id) sender
+{
+    if ( impl )
+    {
+        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
+        if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) ) {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+            event.SetEventObject( wxpeer );
+            event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
+            wxpeer->HandleWindowEvent( event );
+        }
+    }
+}
+*/

 @end
 
 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
 @end
 
 wxNSTextFieldControl::wxNSTextFieldControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)


@@ -110,6 +149,7 @@ bool wxNSTextFieldControl::CanPaste() const
 
 void wxNSTextFieldControl::SetEditable(bool editable) 
 {
 
 void wxNSTextFieldControl::SetEditable(bool editable) 
 {

+    [(wxNSTextField*) m_osxView setEditable:editable];

 }
 
 void wxNSTextFieldControl::GetSelection( long* from, long* to) const 
 }
 
 void wxNSTextFieldControl::GetSelection( long* from, long* to) const 


@@ -136,11 +176,8 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
                                     long style, 
                                     long extraStyle)
 {
                                     long style, 
                                     long extraStyle)
 {

-    NSView* sv = (wxpeer->GetParent()->GetHandle() );
-    

     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];

-    [sv addSubview:v];

     
     if ( style & wxNO_BORDER )
     {
     
     if ( style & wxNO_BORDER )
     {