draw the focus rect ourselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -300,6 +300,7 @@ public :
|
|||||||
const wxSize& size, long style ) ;
|
const wxSize& size, long style ) ;
|
||||||
~wxMacMLTEClassicControl() ;
|
~wxMacMLTEClassicControl() ;
|
||||||
virtual void VisibilityChanged(bool shown) ;
|
virtual void VisibilityChanged(bool shown) ;
|
||||||
|
virtual bool NeedsFocusRect() const;
|
||||||
protected :
|
protected :
|
||||||
OSStatus DoCreate();
|
OSStatus DoCreate();
|
||||||
public :
|
public :
|
||||||
@@ -1527,7 +1528,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
|
|||||||
fontStyle |= bold ;
|
fontStyle |= bold ;
|
||||||
if ( font.GetStyle() == wxITALIC )
|
if ( font.GetStyle() == wxITALIC )
|
||||||
fontStyle |= italic ;
|
fontStyle |= italic ;
|
||||||
|
|
||||||
typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
|
typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
|
||||||
typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
|
typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
|
||||||
typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
|
typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
|
||||||
@@ -2067,7 +2068,7 @@ static void TPRedrawFocusOutline(STPTextPaneVars *varsp) {
|
|||||||
if (varsp->fFocusDrawState != (varsp->fIsActive && varsp->fInFocus))
|
if (varsp->fFocusDrawState != (varsp->fIsActive && varsp->fInFocus))
|
||||||
{
|
{
|
||||||
varsp->fFocusDrawState = (varsp->fIsActive && varsp->fInFocus);
|
varsp->fFocusDrawState = (varsp->fIsActive && varsp->fInFocus);
|
||||||
DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fFocusDrawState);
|
// DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fFocusDrawState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2411,6 +2412,11 @@ void wxMacMLTEClassicControl::VisibilityChanged(bool shown)
|
|||||||
InvalWindowRect( GetControlOwner( m_controlRef ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ;
|
InvalWindowRect( GetControlOwner( m_controlRef ) , &((STPTextPaneVars *)m_macTXNvars)->fRBounds ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxMacMLTEClassicControl::NeedsFocusRect() const
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
OSStatus wxMacMLTEClassicControl::DoCreate()
|
OSStatus wxMacMLTEClassicControl::DoCreate()
|
||||||
{
|
{
|
||||||
Rect bounds;
|
Rect bounds;
|
||||||
|
Reference in New Issue
Block a user