From 6331c8c0216d220618e2f3017c59db1e2fd56a29 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 23 Mar 2009 15:32:34 +0000 Subject: [PATCH] textctrl cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/private.h | 4 --- src/osx/cocoa/srchctrl.mm | 9 ++--- src/osx/cocoa/textctrl.mm | 63 ++++++++++------------------------ 3 files changed, 23 insertions(+), 53 deletions(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 3fa6846c61..18b35c9076 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -246,11 +246,7 @@ protected : @interface wxNSTextField : NSTextField { - wxWidgetCocoaImpl* impl; } - - - (void) setImplementation:(wxWidgetCocoaImpl*) item; - - (wxWidgetCocoaImpl*) implementation; @end @interface wxNSMenu : NSMenu diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm index 32d3514b3a..6b761d7f97 100644 --- a/src/osx/cocoa/srchctrl.mm +++ b/src/osx/cocoa/srchctrl.mm @@ -57,6 +57,7 @@ - (void) searchAction: (id) sender { + (void) sender; wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { @@ -151,13 +152,13 @@ wxNSSearchFieldControl::~wxNSSearchFieldControl() } wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxString& str, const wxPoint& pos, const wxSize& size, - long style, - long extraStyle) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSSearchField* v = [[wxNSSearchField alloc] initWithFrame:r]; diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index fc2169099e..8ad2937d97 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -51,11 +51,7 @@ @interface wxNSSecureTextField : NSSecureTextField { - wxWidgetCocoaImpl* impl; } - -- (void) setImplementation:(wxWidgetCocoaImpl*) item; -- (wxWidgetCocoaImpl*) implementation; @end @implementation wxNSSecureTextField @@ -70,18 +66,10 @@ } } -- (wxWidgetCocoaImpl*) implementation -{ - return impl; -} - -- (void) setImplementation:(wxWidgetCocoaImpl*) item -{ - impl = item; -} - - (void)controlTextDidChange:(NSNotification *)aNotification { + wxUnusedVar(aNotification); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer(); @@ -98,11 +86,8 @@ @interface wxNSTextView : NSScrollView { - wxWidgetCocoaImpl* impl; } -- (void) setImplementation:(wxWidgetCocoaImpl*) item; -- (wxWidgetCocoaImpl*) implementation; @end @implementation wxNSTextView @@ -117,19 +102,10 @@ } } -- (wxWidgetCocoaImpl*) implementation -{ - return impl; -} - -- (void) setImplementation:(wxWidgetCocoaImpl*) item -{ - impl = item; -} - - - (void)textDidChange:(NSNotification *)aNotification { + wxUnusedVar(aNotification); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer(); @@ -144,6 +120,8 @@ - (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)commandSelector { + wxUnusedVar(aTextView); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer(); @@ -175,16 +153,6 @@ } } -- (wxWidgetCocoaImpl*) implementation -{ - return impl; -} - -- (void) setImplementation:(wxWidgetCocoaImpl*) item -{ - impl = item; -} - - (void) setEnabled:(BOOL) flag { [super setEnabled: flag]; @@ -203,6 +171,8 @@ - (void)controlTextDidChange:(NSNotification *)aNotification { + wxUnusedVar(aNotification); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer(); @@ -219,8 +189,11 @@ typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl - (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector { + wxUnusedVar(textView); + wxUnusedVar(control); if (commandSelector == @selector(insertNewline:)) { + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if ( impl ) { wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer(); @@ -258,7 +231,6 @@ typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxWidgetCocoaImpl(wxPeer, w) { m_scrollView = (NSScrollView*) w; - [(wxNSTextField*)w setImplementation: this]; [m_scrollView setHasVerticalScroller:YES]; [m_scrollView setHasHorizontalScroller:NO]; @@ -439,7 +411,8 @@ void wxNSTextFieldControl::WriteText(const wxString& str) SetSelection(GetStringValue().length(), GetStringValue().length()); } -void wxNSTextFieldControl::controlAction(WXWidget slf, void* _cmd, void *sender) +void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf), + void* WXUNUSED(_cmd), void *WXUNUSED(sender)) { wxWindow* wxpeer = (wxWindow*) GetWXPeer(); if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) ) @@ -456,26 +429,27 @@ void wxNSTextFieldControl::controlAction(WXWidget slf, void* _cmd, void *sender) // wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxString& str, const wxPoint& pos, const wxSize& size, long style, - long extraStyle) + long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; - NSTextField* v = nil; wxWidgetCocoaImpl* c = NULL; if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 ) { + wxNSTextView* v = nil; v = [[wxNSTextView alloc] initWithFrame:r]; c = new wxNSTextViewControl( wxpeer, v ); static_cast(c)->SetStringValue(str); } else { + NSTextField* v = nil; if ( style & wxTE_PASSWORD ) v = [[wxNSSecureTextField alloc] initWithFrame:r]; else @@ -491,7 +465,6 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, [v setBordered:NO]; c = new wxNSTextFieldControl( wxpeer, v ); - [v setImplementation: c]; static_cast(c)->SetStringValue(str); } -- 2.45.2