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

Minor additional clipper window related code and comment tweak

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-03 15:31:23 +00:00
parent e9d2b75fb5
commit 14c140606b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/propgrid.cpp
View File

@@ -3603,16 +3603,14 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
goodPos, goodPos,
grect.GetSize()); 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_wndEditor = wndList.m_primary;
m_wndEditor2 = wndList.m_secondary; m_wndEditor2 = wndList.m_secondary;
wxWindow* primaryCtrl = GetEditorControl(); wxWindow* primaryCtrl = GetEditorControl();
//
// Essentially, primaryCtrl == m_wndEditor
//
// NOTE: It is allowed for m_wndEditor to be NULL - in this case // NOTE: It is allowed for m_wndEditor to be NULL - in this case
// value is drawn as normal, and m_wndEditor2 is assumed // value is drawn as normal, and m_wndEditor2 is assumed
// to be a right-aligned button that triggers a separate editorCtrl // 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); m_wndEditor->SetSizeHints(3, 3);
if ( m_wndEditor != primaryCtrl )
primaryCtrl->SetSizeHints(3, 3);
#if wxPG_CREATE_CONTROLS_HIDDEN #if wxPG_CREATE_CONTROLS_HIDDEN
m_wndEditor->Show(false); m_wndEditor->Show(false);