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

Fixed property Hide command

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-02-25 14:04:25 +00:00
parent 98a0eff633
commit 7fe5c04d6a
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
samples/propgrid/propgrid.cpp
View File

@@ -750,7 +750,7 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame)
EVT_MENU( ID_DELETEALL, FormMain::OnClearClick ) EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable ) EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
EVT_MENU( ID_SETREADONLY, FormMain::OnSetReadOnly ) EVT_MENU( ID_SETREADONLY, FormMain::OnSetReadOnly )
EVT_MENU( ID_HIDE, FormMain::OnHideShow ) EVT_MENU( ID_HIDE, FormMain::OnHide )
EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click ) EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click ) EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
@@ -2289,7 +2289,7 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"), m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"),
wxT("Toggles item's enabled state.") ); wxT("Toggles item's enabled state.") );
m_itemEnable->Enable( FALSE ); m_itemEnable->Enable( FALSE );
menuTools1->Append(ID_HIDE, wxT("Hide"), wxT("Shows or hides a property") ); menuTools1->Append(ID_HIDE, "Hide", "Hides a property" );
menuTools1->Append(ID_SETREADONLY, "Set as Read-Only", menuTools1->Append(ID_SETREADONLY, "Set as Read-Only",
"Set property as read-only" ); "Set property as read-only" );
@@ -2752,7 +2752,7 @@ void FormMain::OnSetReadOnly( wxCommandEvent& WXUNUSED(event) )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) ) void FormMain::OnHide( wxCommandEvent& WXUNUSED(event) )
{ {
wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection(); wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection();
if ( !id ) if ( !id )
@@ -2761,27 +2761,7 @@ void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) )
return; return;
} }
if ( m_pPropGridManager->IsPropertyShown( id ) )
{
m_pPropGridManager->HideProperty( id, true ); m_pPropGridManager->HideProperty( id, true );
m_itemEnable->SetItemLabel( wxT("Show") );
}
else
{
m_pPropGridManager->HideProperty( id, false );
m_itemEnable->SetItemLabel( wxT("Hide") );
}
wxPropertyGridPage* curPage = m_pPropGridManager->GetCurrentPage();
// Check for bottomY precalculation validity
unsigned int byPre = curPage->GetVirtualHeight();
unsigned int byAct = curPage->GetActualVirtualHeight();
if ( byPre != byAct )
{
wxLogDebug(wxT("VirtualHeight is %u, should be %u"), byPre, byAct);
}
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

2
samples/propgrid/propgrid.h
View File

@@ -186,7 +186,7 @@ public:
void OnEnableDisable( wxCommandEvent& event ); void OnEnableDisable( wxCommandEvent& event );
void OnSetReadOnly( wxCommandEvent& event ); void OnSetReadOnly( wxCommandEvent& event );
void OnHideShow( wxCommandEvent& event ); void OnHide( wxCommandEvent& event );
void OnSetBackgroundColour( wxCommandEvent& event ); void OnSetBackgroundColour( wxCommandEvent& event );
void OnClearModifyStatusClick( wxCommandEvent& event ); void OnClearModifyStatusClick( wxCommandEvent& event );
void OnFreezeClick( wxCommandEvent& event ); void OnFreezeClick( wxCommandEvent& event );