Implement wxSTAY_ON_TOP for wxMessageDialog in wxGTK.

[wxWidgets.git] / src / propgrid / manager.cpp

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 444902899c880c5c32ae1bfeb7e99e8c8bd07ecf..158cc557ab61b6ab5d7e1e0da1d1c74b03d03231 100644 (file)
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -423,8 +423,9 @@ wxPropertyGridManager::~wxPropertyGridManager()
 {
     END_MOUSE_CAPTURE
 
 {
     END_MOUSE_CAPTURE
 

-    m_pPropGrid->DoSelectProperty(NULL);
-    m_pPropGrid->m_pState = NULL;
+    //m_pPropGrid->ClearSelection();
+    delete m_pPropGrid;
+    m_pPropGrid = NULL;

 
     size_t i;
     for ( i=0; i<m_arrPages.size(); i++ )
 
     size_t i;
     for ( i=0; i<m_arrPages.size(); i++ )


@@ -553,7 +554,7 @@ bool wxPropertyGridManager::DoSelectPage( int index )
     if ( m_selPage == index )
         return true;
 
     if ( m_selPage == index )
         return true;
 

-    if ( m_pPropGrid->m_selected )
+    if ( m_pPropGrid->GetSelection() )

     {
         if ( !m_pPropGrid->ClearSelection() )
             return false;
     {
         if ( !m_pPropGrid->ClearSelection() )
             return false;


@@ -725,10 +726,10 @@ void wxPropertyGridManager::SetColumnCount( int colCount, int page )
 
 size_t wxPropertyGridManager::GetPageCount() const
 {
 
 size_t wxPropertyGridManager::GetPageCount() const
 {

-       if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) )
-               return 0;
+    if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) )
+        return 0;

 
 

-       return m_arrPages.size();
+    return m_arrPages.size();

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------


@@ -883,6 +884,19 @@ bool wxPropertyGridManager::IsPageModified( size_t index ) const
 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 

+bool wxPropertyGridManager::IsPropertySelected( wxPGPropArg id ) const
+{
+    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
+    for ( unsigned int i=0; i<GetPageCount(); i++ )
+    {
+        if ( GetPageState(i)->DoIsPropertySelected(p) )
+            return true;
+    }
+    return false;
+}
+
+// -----------------------------------------------------------------------
+

 wxPGProperty* wxPropertyGridManager::GetPageRoot( int index ) const
 {
     wxASSERT( index >= 0 );
 wxPGProperty* wxPropertyGridManager::GetPageRoot( int index ) const
 {
     wxASSERT( index >= 0 );