Test in GetFirstChild() if item is known to control

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

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 6009a5e55318b2f027d4b40ca1f118010e35bcea..2b013e6d9a45cf1b8b65779c3a10abf54a060ef2 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -138,6 +138,7 @@ public:
             "Ninth symphony", "Ludwig van Beethoven", "1824" ) );
         m_classical->Append( new MyMusicModelNode( m_classical, GetNewId(), 
             "German Requiem", "Johannes Brahms", "1868" ) );
             "Ninth symphony", "Ludwig van Beethoven", "1824" ) );
         m_classical->Append( new MyMusicModelNode( m_classical, GetNewId(), 
             "German Requiem", "Johannes Brahms", "1868" ) );

+        m_classicalMusicIsKnownToControl = false;

     }
     
     void AddToClassical( const wxString &title, const wxString &artist, const wxString &year )
     }
     
     void AddToClassical( const wxString &title, const wxString &artist, const wxString &year )


@@ -147,11 +148,13 @@ public:
             new MyMusicModelNode( m_classical, GetNewId(), title, artist, year );
         m_classical->Append( child_node );
         
             new MyMusicModelNode( m_classical, GetNewId(), title, artist, year );
         m_classical->Append( child_node );
         

-        // notify control
-        wxDataViewItem child( child_node->GetID() );
-        wxDataViewItem parent( m_classical->GetID() );
-        wxPrintf( "parent id %d\n", m_classical->GetID() );
-        ItemAdded( parent, child );
+        if (m_classicalMusicIsKnownToControl)
+        {
+            // notify control
+            wxDataViewItem child( child_node->GetID() );
+            wxDataViewItem parent( m_classical->GetID() );
+            ItemAdded( parent, child );
+        }

     }
     
     virtual unsigned int GetColumnCount() const
     }
     
     virtual unsigned int GetColumnCount() const


@@ -208,6 +211,12 @@ public:
             
         if (node->GetChildCount() == 0)
             return wxDataViewItem( 0 );
             
         if (node->GetChildCount() == 0)
             return wxDataViewItem( 0 );

+           
+        if (node == m_classical)
+        {
+            MyMusicModel *model = (MyMusicModel*)(const MyMusicModel*) this;
+            model->m_classicalMusicIsKnownToControl = true;
+        }

         
         MyMusicModelNode *first_child = node->GetChildren().Item( 0 );
         return wxDataViewItem( first_child->GetID() );
         
         MyMusicModelNode *first_child = node->GetChildren().Item( 0 );
         return wxDataViewItem( first_child->GetID() );


@@ -265,6 +274,7 @@ private:
     MyMusicModelNode*   m_root;
     MyMusicModelNode*   m_pop;
     MyMusicModelNode*   m_classical;
     MyMusicModelNode*   m_root;
     MyMusicModelNode*   m_pop;
     MyMusicModelNode*   m_classical;

+    bool                m_classicalMusicIsKnownToControl;

     wxUint32            m_idCounter;
 };
 
     wxUint32            m_idCounter;
 };