X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c26d11be9e0e1a69da888d69cd980d77827c6eb..bcffb4d1a9edaa539770382e14129ac902da68d8:/src/propgrid/manager.cpp diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index d328984250..9f203d91b0 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: 2005-01-14 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -31,17 +31,9 @@ #include "wx/pen.h" #include "wx/brush.h" #include "wx/cursor.h" - #include "wx/dialog.h" #include "wx/settings.h" - #include "wx/msgdlg.h" - #include "wx/choice.h" #include "wx/textctrl.h" - #include "wx/dirdlg.h" - #include "wx/combobox.h" - #include "wx/layout.h" #include "wx/sizer.h" - #include "wx/textdlg.h" - #include "wx/filedlg.h" #include "wx/statusbr.h" #include "wx/intl.h" #endif @@ -49,9 +41,9 @@ // This define is necessary to prevent macro clearing #define __wxPG_SOURCE_FILE__ -#include +#include "wx/propgrid/propgrid.h" -#include +#include "wx/propgrid/manager.h" #define wxPG_MAN_ALTERNATE_BASE_ID 11249 // Needed for wxID_ANY madnesss @@ -161,8 +153,6 @@ static const char* gs_xpm_defpage[] = { "................" }; -#define GETPAGESTATE(page) ((wxPropertyGridPage*)m_arrPages.Item(page))->GetStatePtr() - // ----------------------------------------------------------------------- // wxPropertyGridPage // ----------------------------------------------------------------------- @@ -368,7 +358,7 @@ void wxPropertyGridManager::Init2( int style ) pd->m_manager = this; wxPropertyGridPageState* state = pd->GetStatePtr(); state->m_pPropGrid = m_pPropGrid; - m_arrPages.Add( (void*)pd ); + m_arrPages.push_back( pd ); m_pPropGrid->m_pState = state; wxWindowID baseId = GetId(); @@ -430,9 +420,9 @@ wxPropertyGridManager::~wxPropertyGridManager() m_pPropGrid->m_pState = NULL; size_t i; - for ( i=0; iSetWindowStyleFlag( (m_pPropGrid->GetWindowStyleFlag()&~(wxPG_MAN_PASS_FLAGS_MASK)) | (style&wxPG_MAN_PASS_FLAGS_MASK) ); + + // Need to re-position windows? + if ( (oldWindowStyle & (wxPG_TOOLBAR|wxPG_DESCRIPTION)) != + (style & (wxPG_TOOLBAR|wxPG_DESCRIPTION)) ) + { + RecreateControls(); + } } // ----------------------------------------------------------------------- @@ -552,7 +551,7 @@ bool wxPropertyGridManager::DoSelectPage( int index ) if ( index >= 0 ) { - nextPage = (wxPropertyGridPage*)m_arrPages.Item(index); + nextPage = m_arrPages[index]; nextPage->OnShow(); } @@ -603,7 +602,7 @@ int wxPropertyGridManager::GetPageByName( const wxString& name ) const size_t i; for ( i=0; im_label == name ) + if ( m_arrPages[i]->m_label == name ) return i; } return wxNOT_FOUND; @@ -618,7 +617,7 @@ int wxPropertyGridManager::GetPageByState( const wxPropertyGridPageState* pState size_t i; for ( i=0; iGetStatePtr() ) + if ( pState == m_arrPages[i]->GetStatePtr() ) return i; } @@ -630,7 +629,7 @@ int wxPropertyGridManager::GetPageByState( const wxPropertyGridPageState* pState const wxString& wxPropertyGridManager::GetPageName( int index ) const { wxASSERT( index >= 0 && index < (int)GetPageCount() ); - return ((wxPropertyGridPage*)m_arrPages.Item(index))->m_label; + return m_arrPages[index]->m_label; } // ----------------------------------------------------------------------- @@ -644,7 +643,7 @@ wxPropertyGridPageState* wxPropertyGridManager::GetPageState( int page ) const if ( page == -1 ) return m_pState; - return GETPAGESTATE(page); + return m_arrPages[page]; } // ----------------------------------------------------------------------- @@ -672,7 +671,7 @@ void wxPropertyGridManager::ClearPage( int page ) if ( page >= 0 && page < (int)GetPageCount() ) { - wxPropertyGridPageState* state = GETPAGESTATE(page); + wxPropertyGridPageState* state = m_arrPages[page]; if ( state == m_pPropGrid->GetState() ) m_pPropGrid->Clear(); @@ -708,18 +707,20 @@ size_t wxPropertyGridManager::GetPageCount() const if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) ) return 0; - return m_arrPages.GetCount(); + return m_arrPages.size(); } // ----------------------------------------------------------------------- -int wxPropertyGridManager::InsertPage( int index, const wxString& label, - const wxBitmap& bmp, wxPropertyGridPage* pageObj ) +wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index, + const wxString& label, + const wxBitmap& bmp, + wxPropertyGridPage* pageObj ) { if ( index < 0 ) index = GetPageCount(); - wxCHECK_MSG( (size_t)index == GetPageCount(), -1, + wxCHECK_MSG( (size_t)index == GetPageCount(), NULL, wxT("wxPropertyGridManager currently only supports appending pages (due to wxToolBar limitation).")); bool needInit = true; @@ -781,7 +782,7 @@ int wxPropertyGridManager::InsertPage( int index, const wxString& label, pageObj->m_id = m_nextTbInd; if ( isPageInserted ) - m_arrPages.Add( (void*)pageObj ); + m_arrPages.push_back( pageObj ); #if wxUSE_TOOLBAR if ( m_windowStyle & wxPG_TOOLBAR ) @@ -834,7 +835,7 @@ int wxPropertyGridManager::InsertPage( int index, const wxString& label, wxASSERT( pageObj->GetGrid() ); - return index; + return pageObj; } // ----------------------------------------------------------------------- @@ -844,7 +845,7 @@ bool wxPropertyGridManager::IsAnyModified() const size_t i; for ( i=0; iGetStatePtr()->m_anyModified ) + if ( m_arrPages[i]->GetStatePtr()->m_anyModified ) return true; } return false; @@ -854,7 +855,7 @@ bool wxPropertyGridManager::IsAnyModified() const bool wxPropertyGridManager::IsPageModified( size_t index ) const { - if ( ((wxPropertyGridPage*)m_arrPages.Item(index))->GetStatePtr()->m_anyModified ) + if ( m_arrPages[index]->GetStatePtr()->m_anyModified ) return true; return false; } @@ -864,9 +865,9 @@ bool wxPropertyGridManager::IsPageModified( size_t index ) const wxPGProperty* wxPropertyGridManager::GetPageRoot( int index ) const { wxASSERT( index >= 0 ); - wxASSERT( index < (int)m_arrPages.GetCount() ); + wxASSERT( index < (int)m_arrPages.size() ); - return ((wxPropertyGridPage*)m_arrPages.Item(index))->GetStatePtr()->m_properties; + return m_arrPages[index]->GetStatePtr()->m_properties; } // ----------------------------------------------------------------------- @@ -877,9 +878,9 @@ bool wxPropertyGridManager::RemovePage( int page ) false, wxT("invalid page index") ); - wxPropertyGridPage* pd = (wxPropertyGridPage*)m_arrPages.Item(page); + wxPropertyGridPage* pd = m_arrPages[page]; - if ( m_arrPages.GetCount() == 1 ) + if ( m_arrPages.size() == 1 ) { // Last page: do not remove page entry m_pPropGrid->Clear(); @@ -887,6 +888,7 @@ bool wxPropertyGridManager::RemovePage( int page ) m_iFlags &= ~wxPG_MAN_FL_PAGE_INSERTED; pd->m_label.clear(); } + // Change selection if current is page else if ( page == m_selPage ) { @@ -919,9 +921,9 @@ bool wxPropertyGridManager::RemovePage( int page ) } #endif - if ( m_arrPages.GetCount() > 1 ) + if ( m_arrPages.size() > 1 ) { - m_arrPages.RemoveAt(page); + m_arrPages.erase(m_arrPages.begin() + page); delete pd; } @@ -1133,9 +1135,12 @@ void wxPropertyGridManager::SetDescBoxHeight( int ht, bool refresh ) { if ( m_windowStyle & wxPG_DESCRIPTION ) { - m_nextDescBoxSize = ht; - if ( refresh ) - RecalculatePositions(m_width, m_height); + if ( ht != GetDescBoxHeight() ) + { + m_nextDescBoxSize = ht; + if ( refresh ) + RecalculatePositions(m_width, m_height); + } } } @@ -1143,7 +1148,7 @@ void wxPropertyGridManager::SetDescBoxHeight( int ht, bool refresh ) int wxPropertyGridManager::GetDescBoxHeight() const { - return GetClientSize().y - m_splitterY; + return GetClientSize().y - m_splitterY - m_splitterHeight; } // ----------------------------------------------------------------------- @@ -1316,7 +1321,7 @@ wxPGProperty* wxPropertyGridManager::DoGetPropertyByName( const wxString& name ) size_t i; for ( i=0; iGetStatePtr(); + wxPropertyGridPageState* pState = m_arrPages[i]->GetStatePtr(); wxPGProperty* p = pState->BaseGetPropertyByName(name); if ( p ) { @@ -1343,13 +1348,6 @@ bool wxPropertyGridManager::EnsureVisible( wxPGPropArg id ) // ----------------------------------------------------------------------- -size_t wxPropertyGridManager::GetChildrenCount( int page_index ) -{ - return GetChildrenCount( GetPage(page_index)->GetStatePtr()->m_properties ); -} - -// ----------------------------------------------------------------------- - void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) { int id = event.GetId(); @@ -1382,7 +1380,7 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) // Find page with given id. for ( i=0; im_id == id ) { index = i; @@ -1410,6 +1408,29 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event ) // ----------------------------------------------------------------------- +bool wxPropertyGridManager::SetEditableStateItem( const wxString& name, wxVariant value ) +{ + if ( name == wxS("descboxheight") ) + { + SetDescBoxHeight(value.GetLong(), true); + return true; + } + return false; +} + +// ----------------------------------------------------------------------- + +wxVariant wxPropertyGridManager::GetEditableStateItem( const wxString& name ) const +{ + if ( name == wxS("descboxheight") ) + { + return (long) GetDescBoxHeight(); + } + return wxNullVariant; +} + +// ----------------------------------------------------------------------- + void wxPropertyGridManager::SetDescription( const wxString& label, const wxString& content ) { if ( m_pTxtHelpCaption ) @@ -1464,7 +1485,7 @@ void wxPropertyGridManager::SetSplitterLeft( bool subProps, bool allPages ) for ( i=0; iGetColumnFitWidth(dc, GETPAGESTATE(i)->m_properties, 0, subProps ); + int maxW = m_pState->GetColumnFitWidth(dc, m_arrPages[i]->m_properties, 0, subProps ); maxW += m_pPropGrid->m_marginWidth; if ( maxW > highest ) highest = maxW;