Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that WriteText moves the selection to the end and scrolls to the end, and implement EVT_TEXT_ENTER for NSTextField.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-05 05:43:59 +00:00
parent b480b80a27
commit 2d6aa9197f
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/osx/cocoa/textctrl.mm
View File

@@ -195,6 +195,27 @@
} }
} }
typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl *control, NSTextView* textView, SEL commandSelector);
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
{
if (commandSelector == @selector(insertNewline:))
{
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 );
}
}
}
return NO;
}
/* /*
- (void)controlTextDidEndEditing:(NSNotification *)aNotification - (void)controlTextDidEndEditing:(NSNotification *)aNotification
{ {
@@ -217,7 +238,7 @@
wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w) wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w)
{ {
m_scrollView = (NSScrollView*) w; m_scrollView = (NSScrollView*) w;
[w setImplementation: this]; [(wxNSTextField*)w setImplementation: this];
[m_scrollView setHasVerticalScroller:YES]; [m_scrollView setHasVerticalScroller:YES];
[m_scrollView setHasHorizontalScroller:NO]; [m_scrollView setHasHorizontalScroller:NO];
@@ -297,7 +318,9 @@ void wxNSTextViewControl::GetSelection( long* from, long* to) const
void wxNSTextViewControl::SetSelection( long from , long to ) void wxNSTextViewControl::SetSelection( long from , long to )
{ {
[m_textView setSelectedRange:NSMakeRange(from, to-from)]; NSRange selrange = NSMakeRange(from, to-from);
[m_textView setSelectedRange:selrange];
[m_textView scrollRangeToVisible:selrange];
} }
void wxNSTextViewControl::WriteText(const wxString& str) void wxNSTextViewControl::WriteText(const wxString& str)
@@ -305,6 +328,7 @@ void wxNSTextViewControl::WriteText(const wxString& str)
// temp hack to get logging working early // temp hack to get logging working early
wxString former = GetStringValue(); wxString former = GetStringValue();
SetStringValue( former + str ); SetStringValue( former + str );
SetSelection(GetStringValue().length(), GetStringValue().length());
} }
// wxNSTextFieldControl // wxNSTextFieldControl
@@ -392,6 +416,7 @@ void wxNSTextFieldControl::WriteText(const wxString& str)
// temp hack to get logging working early // temp hack to get logging working early
wxString former = GetStringValue(); wxString former = GetStringValue();
SetStringValue( former + str ); SetStringValue( former + str );
SetSelection(GetStringValue().length(), GetStringValue().length());
} }
void wxNSTextFieldControl::controlAction(WXWidget slf, void* _cmd, void *sender) void wxNSTextFieldControl::controlAction(WXWidget slf, void* _cmd, void *sender)