Disabling sheets codepath until we can resolve the nested loop issue.

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

diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index ed24230a420326a44af619ae57c970f81e885396..311507eb3e06a763c4dd96aea45463d64076d77a 100644 (file)
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -255,7 +255,7 @@ void wxPropertyGridPageState::InitNonCatMode()
             wxPGProperty* parent = p->GetParent();
             if ( parent->IsCategory() || parent->IsRoot() )
             {
             wxPGProperty* parent = p->GetParent();
             if ( parent->IsCategory() || parent->IsRoot() )
             {

-                m_abcArray->AddChild2(p);
+                m_abcArray->DoAddChild(p);

                 p->m_parent = &m_regularArray;
             }
         }
                 p->m_parent = &m_regularArray;
             }
         }


@@ -268,6 +268,15 @@ void wxPropertyGridPageState::InitNonCatMode()
 
 void wxPropertyGridPageState::DoClear()
 {
 
 void wxPropertyGridPageState::DoClear()
 {

+    if ( m_pPropGrid && m_pPropGrid->GetState() == this  )
+    {
+        m_pPropGrid->ClearSelection(false);
+    }
+    else
+    {
+        m_selected = NULL;
+    }
+

     m_regularArray.Empty();
     if ( m_abcArray )
         m_abcArray->Empty();
     m_regularArray.Empty();
     if ( m_abcArray )
         m_abcArray->Empty();


@@ -280,8 +289,6 @@ void wxPropertyGridPageState::DoClear()
 
     m_virtualHeight = 0;
     m_vhCalcPending = 0;
 
     m_virtualHeight = 0;
     m_vhCalcPending = 0;

-
-    m_selected = NULL;

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


@@ -940,9 +947,7 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
 
     //
     // Column to reduce, if needed. Take last one that exceeds minimum width.
 
     //
     // Column to reduce, if needed. Take last one that exceeds minimum width.

-    // Except if auto splitter centering is used, in which case use widest.

     int reduceCol = -1;
     int reduceCol = -1;

-    int highestColWidth = 0;

 
 #ifdef __WXDEBUG__
     if ( debug )
 
 #ifdef __WXDEBUG__
     if ( debug )


@@ -960,18 +965,9 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
         }
         else
         {
         }
         else
         {

-            if ( pg->HasFlag(wxPG_SPLITTER_AUTO_CENTER) )
-            {
-                if ( m_colWidths[i] >= highestColWidth )
-                {
-                    highestColWidth = m_colWidths[i];
-                    reduceCol = i;
-                }
-            }
-            else
-            {
-                reduceCol = i;
-            }
+            // Always reduce the last column that is larger than minimum size
+            // (looks nicer, even with auto-centering enabled).
+            reduceCol = i;

         }
     }
 
         }
     }
 


@@ -1570,16 +1566,18 @@ bool wxPropertyGridPageState::PrepareToAddItem( wxPGProperty* property,
         }
     }
 
         }
     }
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // Warn for identical names in debug mode.
     if ( BaseGetPropertyByName(property->GetName()) &&
          (!scheduledParent || scheduledParent->IsCategory()) )
     {
     // Warn for identical names in debug mode.
     if ( BaseGetPropertyByName(property->GetName()) &&
          (!scheduledParent || scheduledParent->IsCategory()) )
     {

-        wxLogError(wxT("wxPropertyGrid: Warning - item with name \"%s\" already exists."),
-            property->GetName().c_str());
+        wxFAIL_MSG(wxString::Format(
+            "wxPropertyGrid item with name \"%s\" already exists",
+            property->GetName()));
+

         wxPGGlobalVars->m_warnings++;
     }
         wxPGGlobalVars->m_warnings++;
     }

-#endif
+#endif // wxDEBUG_LEVEL

 
     // Make sure nothing is selected.
     if ( propGrid )
 
     // Make sure nothing is selected.
     if ( propGrid )


@@ -1659,11 +1657,11 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index
         if ( m_abcArray && !property->IsCategory() &&
              (parentIsCategory || parentIsRoot) )
         {
         if ( m_abcArray && !property->IsCategory() &&
              (parentIsCategory || parentIsRoot) )
         {

-            m_abcArray->AddChild2( property, -1, false );
+            m_abcArray->DoAddChild( property, -1, false );

         }
 
         // Add to current mode.
         }
 
         // Add to current mode.

-        parent->AddChild2( property, index, true );
+        parent->DoAddChild( property, index, true );

     }
     else
     {
     }
     else
     {


@@ -1671,14 +1669,14 @@ wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index
 
         if ( parentIsCategory )
             // Parent is category.
 
         if ( parentIsCategory )
             // Parent is category.

-            parent->AddChild2( property, index, false );
+            parent->DoAddChild( property, index, false );

         else if ( parentIsRoot )
             // Parent is root.
         else if ( parentIsRoot )
             // Parent is root.

-            m_regularArray.AddChild2( property, -1, false );
+            m_regularArray.DoAddChild( property, -1, false );

 
         // Add to current mode
         if ( !property->IsCategory() )
 
         // Add to current mode
         if ( !property->IsCategory() )

-            m_abcArray->AddChild2( property, index, true );
+            m_abcArray->DoAddChild( property, index, true );

     }
 
     // category stuff
     }
 
     // category stuff