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

fixing double focus ring under 10.7, emulating only for 'NO_' and 'SIMPLE_' border

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-07-07 16:34:14 +00:00
parent 97981439aa
commit 58cab5e243
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,6 +923,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
wxNSTextScrollView* v = nil; wxNSTextScrollView* v = nil;
v = [[wxNSTextScrollView alloc] initWithFrame:r]; v = [[wxNSTextScrollView alloc] initWithFrame:r];
c = new wxNSTextViewControl( wxpeer, v ); c = new wxNSTextViewControl( wxpeer, v );
c->SetNeedsFocusRect( true );
} }
else else
{ {
@@ -940,25 +941,31 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
{ {
[v setAlignment:NSCenterTextAlignment]; [v setAlignment:NSCenterTextAlignment];
} }
if ( style & wxNO_BORDER )
{
// FIXME: How can we remove the native control's border?
// setBordered is separate from the text ctrl's border.
}
NSTextFieldCell* cell = [v cell]; NSTextFieldCell* cell = [v cell];
[cell setScrollable:YES]; [cell setScrollable:YES];
// TODO: Remove if we definitely are sure, it's not needed // TODO: Remove if we definitely are sure, it's not needed
// as setting scrolling to yes, should turn off any wrapping // as setting scrolling to yes, should turn off any wrapping
// [cell setLineBreakMode:NSLineBreakByClipping]; // [cell setLineBreakMode:NSLineBreakByClipping];
[v setBezeled:NO];
[v setBordered:NO];
c = new wxNSTextFieldControl( wxpeer, wxpeer, v ); c = new wxNSTextFieldControl( wxpeer, wxpeer, v );
if ( (style & wxNO_BORDER) || (style & wxSIMPLE_BORDER) )
{
// under 10.7 the textcontrol can draw its own focus
// even if no border is shown, on previous systems
// we have to emulate this
[v setBezeled:NO];
[v setBordered:NO];
if ( UMAGetSystemVersion() < 0x1070 )
c->SetNeedsFocusRect( true );
}
else
{
// use native border
c->SetNeedsFrame(false);
}
} }
c->SetNeedsFocusRect( true );
return c; return c;
} }