AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed obsolete conditional compile option wxPG_CREATE_CONTROLS_HIDDEN

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2009-08-23 15:34:25 +00:00
parent 58935d4a5c
commit 1bfcd80c2f
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/propgrid/propgriddefs.h
View File

@ -54,10 +54,6 @@
// width of optional bitmap/image in front of property
#define wxPG_CUSTOM_IMAGE_WIDTH 20
// 1 to create controls out of sight, hide them, and then move them into
// correct position
#define wxPG_CREATE_CONTROLS_HIDDEN 0
// 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 0
@ -95,10 +91,6 @@
// width of optional bitmap/image in front of property
#define wxPG_CUSTOM_IMAGE_WIDTH 20
// 1 to create controls out of sight, hide them, and then move them into
// correct position
#define wxPG_CREATE_CONTROLS_HIDDEN 0
// 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 1
@ -136,10 +128,6 @@
// width of optional bitmap/image in front of property
#define wxPG_CUSTOM_IMAGE_WIDTH 20
// 1 to create controls out of sight, hide them, and then move them into
// correct position
#define wxPG_CREATE_CONTROLS_HIDDEN 0
// 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 0
@ -177,10 +165,6 @@
// width of optional bitmap/image in front of property
#define wxPG_CUSTOM_IMAGE_WIDTH 20
// 1 to create controls out of sight, hide them, and then move them into
// correct position
#define wxPG_CREATE_CONTROLS_HIDDEN 0
// 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 1

29
src/propgrid/propgrid.cpp
View File

@ -3780,10 +3780,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
wxRect grect = GetEditorWidgetRect(p, m_selColumn);
wxPoint goodPos = grect.GetPosition();
#if wxPG_CREATE_CONTROLS_HIDDEN
int coord_adjust = m_height - goodPos.y;
goodPos.y += coord_adjust;
#endif
const wxPGEditor* editor = p->GetEditorClass();
wxCHECK_MSG(editor, false,
@ -3853,15 +3849,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
m_wndEditor->SetSizeHints(3, 3);
#if wxPG_CREATE_CONTROLS_HIDDEN
m_wndEditor->Show(false);
m_wndEditor->Freeze();
goodPos = m_wndEditor->GetPosition();
goodPos.y -= coord_adjust;
m_wndEditor->Move( goodPos );
#endif
SetupChildEventHandling(primaryCtrl);
// Focus and select all (wxTextCtrl, wxComboBox etc)
@ -3887,19 +3874,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
m_wndEditor2->SetSizeHints(3,3);
#if wxPG_CREATE_CONTROLS_HIDDEN
wxRect sec_rect = m_wndEditor2->GetRect();
sec_rect.y -= coord_adjust;
// Fine tuning required to fix "oversized"
// button disappearance bug.
if ( sec_rect.y < 0 )
{
sec_rect.height += sec_rect.y;
sec_rect.y = 0;
}
m_wndEditor2->SetSize( sec_rect );
#endif
m_wndEditor2->Show();
SetupChildEventHandling(m_wndEditor2);
@ -3933,9 +3907,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor )
{
#if wxPG_CREATE_CONTROLS_HIDDEN
m_wndEditor->Thaw();
#endif
m_wndEditor->Show(true);
}