Fix wxSearchCtrl appearance under OS X 10.10 Yosemite.
Avoid centered look which renders the control unusable under this version.
Closes #16871.
(this is a backport of 563329f89f
from master)
This commit is contained in:
committed by
Vadim Zeitlin
parent
38e410a273
commit
f313ecf9b6
@@ -636,6 +636,7 @@ wxOSX:
|
|||||||
- Fix length of text in wxTextDataObject.
|
- Fix length of text in wxTextDataObject.
|
||||||
- Fix using wxHTTP and wxFTP from worker thread.
|
- Fix using wxHTTP and wxFTP from worker thread.
|
||||||
- Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
|
- Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
|
||||||
|
- Fix wxSearchCtrl appearance under 10.10 (John Roberts).
|
||||||
- Generate correct events for WXK_NUMPAD_ENTER (John Roberts).
|
- Generate correct events for WXK_NUMPAD_ENTER (John Roberts).
|
||||||
- Fix handling of WXK_NUMPAD_ENTER in wxTextCtrl (John Roberts).
|
- Fix handling of WXK_NUMPAD_ENTER in wxTextCtrl (John Roberts).
|
||||||
- Fix printing all pages non-interactively (John Roberts).
|
- Fix printing all pages non-interactively (John Roberts).
|
||||||
|
@@ -165,7 +165,25 @@ public :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virtual void SetCentredLook( bool centre )
|
||||||
|
{
|
||||||
|
SEL sel = @selector(setCenteredLook:);
|
||||||
|
if ( [m_searchFieldCell respondsToSelector: sel] )
|
||||||
|
{
|
||||||
|
// all this avoids xcode parsing warnings when using
|
||||||
|
// [m_searchFieldCell setCenteredLook:NO];
|
||||||
|
NSMethodSignature* signature =
|
||||||
|
[NSSearchFieldCell instanceMethodSignatureForSelector:sel];
|
||||||
|
NSInvocation* invocation =
|
||||||
|
[NSInvocation invocationWithMethodSignature: signature];
|
||||||
|
[invocation setTarget: m_searchFieldCell];
|
||||||
|
[invocation setSelector:sel];
|
||||||
|
[invocation setArgument:¢re atIndex:2];
|
||||||
|
[invocation invoke];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxNSSearchField* m_searchField;
|
wxNSSearchField* m_searchField;
|
||||||
NSSearchFieldCell* m_searchFieldCell;
|
NSSearchFieldCell* m_searchFieldCell;
|
||||||
@@ -192,6 +210,7 @@ wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxSearchCtrl* wxpeer,
|
|||||||
|
|
||||||
wxNSSearchFieldControl* c = new wxNSSearchFieldControl( wxpeer, v );
|
wxNSSearchFieldControl* c = new wxNSSearchFieldControl( wxpeer, v );
|
||||||
c->SetNeedsFrame( false );
|
c->SetNeedsFrame( false );
|
||||||
|
c->SetCentredLook( false );
|
||||||
c->SetStringValue( str );
|
c->SetStringValue( str );
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user