From bb9da4d3cab285815c5b458bd91f8d7fdd0ae6bf Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Sat, 12 Jun 2010 10:31:24 +0000 Subject: [PATCH] For wxTextCtrl editor, set the bold font before margins are set up or it will not work properly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/editors.cpp | 7 +++++++ src/propgrid/propgrid.cpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 5867b53e1e..ed0c11a48f 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -1919,6 +1919,13 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, } #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 if ( !hasSpecialSize ) FixPosForTextCtrl(tc, forColumn); diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index f734d40507..6af958bbc4 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -1635,8 +1635,8 @@ bool wxPropertyGrid::EnsureVisible( wxPGPropArg id ) // Control font changer helper. void wxPropertyGrid::SetCurControlBoldFont() { - wxASSERT( m_wndEditor ); - m_wndEditor->SetFont( m_captionFont ); + wxWindow* editor = GetEditorControl(); + editor->SetFont( m_captionFont ); } // ----------------------------------------------------------------------- -- 2.45.2