Reduce ambiguity of selection functions in wxPropertyGridManager, make them better...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index e26535de73758381a4546e369c2214fa2db36e6e..ceb1e6289952f6cd0d06c439a286a92131cd04a6 100644 (file)
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -498,14 +498,11 @@ public:
     int GetSelectedPage() const { return m_selPage; }
 
     /** Shortcut for GetGrid()->GetSelection(). */
     int GetSelectedPage() const { return m_selPage; }
 
     /** Shortcut for GetGrid()->GetSelection(). */

-    wxPGProperty* GetSelectedProperty() const
+    wxPGProperty* GetSelection() const

     {
         return m_pPropGrid->GetSelection();
     }
 
     {
         return m_pPropGrid->GetSelection();
     }
 

-    /** Synonyme for GetSelectedPage. */
-    int GetSelection() const { return m_selPage; }
-

     /** Returns a pointer to the toolbar currently associated with the
         wxPropertyGridManager (if any). */
     wxToolBar* GetToolBar() const { return m_pToolbar; }
     /** Returns a pointer to the toolbar currently associated with the
         wxPropertyGridManager (if any). */
     wxToolBar* GetToolBar() const { return m_pToolbar; }


@@ -619,12 +616,6 @@ public:
     */
     void SetSplitterPosition( int pos, int column = 0 );
 
     */
     void SetSplitterPosition( int pos, int column = 0 );
 

-    /** Synonyme for SelectPage(name). */
-    void SetStringSelection( const wxChar* name )
-    {
-        SelectPage( GetPageByName(name) );
-    }
-

 #ifdef SWIG
     %pythoncode {
         def GetValuesFromPage(self,
 #ifdef SWIG
     %pythoncode {
         def GetValuesFromPage(self,

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 9cb6d0a1c1d33008393ef3fada2f20b91816ce43..b01ee0863cabe3796d2cb8138481f8c435696680 100644 (file)
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -1052,7 +1052,7 @@ void FormMain::OnPropertyGridItemDoubleClick( wxPropertyGridEvent& event )
 void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
 {
 #if wxUSE_STATUSBAR
 void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
 {
 #if wxUSE_STATUSBAR

-    wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* prop = m_pPropGridManager->GetSelection();

     wxStatusBar* sb = GetStatusBar();
     if ( prop )
     {
     wxStatusBar* sb = GetStatusBar();
     if ( prop )
     {


@@ -1189,7 +1189,7 @@ void FormMain::OnTestXRC(wxCommandEvent& WXUNUSED(event))
 
 void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event))
 {
 
 void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event))
 {

-    wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* prop = m_pPropGridManager->GetSelection();

     if ( prop )
         prop->EnableCommonValue();
     else
     if ( prop )
         prop->EnableCommonValue();
     else


@@ -2604,7 +2604,7 @@ void FormMain::OnRestoreState( wxCommandEvent& WXUNUSED(event) )
 void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 {
 #if wxUSE_SPINBTN
 void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 {
 #if wxUSE_SPINBTN

-    wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* pgId = m_pPropGridManager->GetSelection();

     if ( pgId )
         m_pPropGridManager->SetPropertyEditor( pgId, wxPG_EDITOR(SpinCtrl) );
     else
     if ( pgId )
         m_pPropGridManager->SetPropertyEditor( pgId, wxPG_EDITOR(SpinCtrl) );
     else


@@ -2616,7 +2616,7 @@ void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 
 void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
 {
 
 void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
 {

-    wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* pgId = m_pPropGridManager->GetSelection();

     if ( pgId )
     {
         wxPGChoices choices;
     if ( pgId )
     {
         wxPGChoices choices;


@@ -2986,7 +2986,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     else if ( id == ID_COLLAPSE )
     {
         // Collapses selected.
     else if ( id == ID_COLLAPSE )
     {
         // Collapses selected.

-        wxPGProperty* id = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* id = m_pPropGridManager->GetSelection();

         if ( id )
         {
             m_pPropGridManager->Collapse(id);
         if ( id )
         {
             m_pPropGridManager->Collapse(id);


@@ -3004,7 +3004,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     }
     else if ( id == ID_UNSPECIFY )
     {
     }
     else if ( id == ID_UNSPECIFY )
     {

-        wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* prop = m_pPropGridManager->GetSelection();

         if ( prop )
         {
             m_pPropGridManager->SetPropertyValueUnspecified(prop);
         if ( prop )
         {
             m_pPropGridManager->SetPropertyValueUnspecified(prop);


@@ -3012,7 +3012,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     }
     else if ( id == ID_SETCOLOUR )
     {
     }
     else if ( id == ID_SETCOLOUR )
     {

-        wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* prop = m_pPropGridManager->GetSelection();

         if ( prop )
         {
             wxColourData data;
         if ( prop )
         {
             wxColourData data;