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

For wxTextCtrl editor, set the bold font before margins are set up or it will not work properly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-06-12 10:31:24 +00:00
parent 372d0bdd67
commit bb9da4d3ca
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/propgrid/editors.cpp
View File

@@ -1919,6 +1919,13 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
} }
#endif #endif
// This code is repeated from DoSelectProperty(). However, font boldness
// must be set before margin is set up below in FixPosForTextCtrl().
if ( forColumn == 1 &&
prop->HasFlag(wxPG_PROP_MODIFIED) &&
HasFlag(wxPG_BOLD_MODIFIED) )
tc->SetFont( m_captionFont );
// Center the control vertically // Center the control vertically
if ( !hasSpecialSize ) if ( !hasSpecialSize )
FixPosForTextCtrl(tc, forColumn); FixPosForTextCtrl(tc, forColumn);

4
src/propgrid/propgrid.cpp
View File

@@ -1635,8 +1635,8 @@ bool wxPropertyGrid::EnsureVisible( wxPGPropArg id )
// Control font changer helper. // Control font changer helper.
void wxPropertyGrid::SetCurControlBoldFont() void wxPropertyGrid::SetCurControlBoldFont()
{ {
wxASSERT( m_wndEditor ); wxWindow* editor = GetEditorControl();
m_wndEditor->SetFont( m_captionFont ); editor->SetFont( m_captionFont );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------