From: Jaakko Salli Date: Fri, 3 Oct 2008 15:31:23 +0000 (+0000) Subject: Minor additional clipper window related code and comment tweak X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/14c140606b3b70cde00c805e210d67154b60cef3 Minor additional clipper window related code and comment tweak git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index c1e994f7da..7a2da5ef85 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -3603,16 +3603,14 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags ) goodPos, grect.GetSize()); - // - // Below, bear in mind the difference between primaryCtrl and m_wndEditor: - // m_wndEditor is the actual wxWindow on canvas, and primaryCtrl is - // the actual editor control. They may different if wxPGClipperWindow is - // used for this editor. - // m_wndEditor = wndList.m_primary; m_wndEditor2 = wndList.m_secondary; wxWindow* primaryCtrl = GetEditorControl(); + // + // Essentially, primaryCtrl == m_wndEditor + // + // NOTE: It is allowed for m_wndEditor to be NULL - in this case // value is drawn as normal, and m_wndEditor2 is assumed // to be a right-aligned button that triggers a separate editorCtrl @@ -3661,8 +3659,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags ) } m_wndEditor->SetSizeHints(3, 3); - if ( m_wndEditor != primaryCtrl ) - primaryCtrl->SetSizeHints(3, 3); #if wxPG_CREATE_CONTROLS_HIDDEN m_wndEditor->Show(false);