added a helper function to show the popup menu allowing to configure the columns...

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 542231d8f34046658166e206139f87216ce4b208..7257f41aa048f09c740e071e8c8c48d0b12b48f2 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -184,11 +184,15 @@ public:
 
     virtual int GetFlags() const
     {
 
     virtual int GetFlags() const
     {

-        int flags = 0;
+        // we can't know in advance whether we can sort by this column or not
+        // with wxGrid API so suppose we can by default
+        int flags = wxCOL_SORTABLE;

         if ( m_grid->CanDragColSize() )
             flags |= wxCOL_RESIZABLE;
         if ( m_grid->CanDragColMove() )
             flags |= wxCOL_REORDERABLE;
         if ( m_grid->CanDragColSize() )
             flags |= wxCOL_RESIZABLE;
         if ( m_grid->CanDragColMove() )
             flags |= wxCOL_REORDERABLE;

+        if ( GetWidth() == 0 )
+            flags |= wxCOL_HIDDEN;

 
         return flags;
     }
 
         return flags;
     }


@@ -4802,7 +4806,7 @@ wxGrid::SetTable(wxGridTableBase *table,
         m_numCols = table->GetNumberCols();
 
         if ( m_useNativeHeader )
         m_numCols = table->GetNumberCols();
 
         if ( m_useNativeHeader )

-            GetColHeader()->SetColumnCount(m_numCols);
+            GetGridColHeader()->SetColumnCount(m_numCols);

 
         m_table = table;
         m_table->SetView( this );
 
         m_table = table;
         m_table->SetView( this );


@@ -5124,20 +5128,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
     // cell it might want to save that stuff to might no longer exist.
     HideCellEditControl();
 
     // cell it might want to save that stuff to might no longer exist.
     HideCellEditControl();
 

-#if 0
-    // if we were using the default widths/heights so far, we must change them
-    // now
-    if ( m_colWidths.IsEmpty() )
-    {
-        InitColWidths();
-    }
-
-    if ( m_rowHeights.IsEmpty() )
-    {
-        InitRowHeights();
-    }
-#endif
-

     switch ( msg.GetId() )
     {
         case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
     switch ( msg.GetId() )
     {
         case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:


@@ -5289,7 +5279,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             m_numCols += numCols;
 
             if ( m_useNativeHeader )
             m_numCols += numCols;
 
             if ( m_useNativeHeader )

-                GetColHeader()->SetColumnCount(m_numCols);
+                GetGridColHeader()->SetColumnCount(m_numCols);

 
             if ( !m_colAt.IsEmpty() )
             {
 
             if ( !m_colAt.IsEmpty() )
             {


@@ -5357,7 +5347,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int oldNumCols = m_numCols;
             m_numCols += numCols;
             if ( m_useNativeHeader )
             int oldNumCols = m_numCols;
             m_numCols += numCols;
             if ( m_useNativeHeader )

-                GetColHeader()->SetColumnCount(m_numCols);
+                GetGridColHeader()->SetColumnCount(m_numCols);

 
             if ( !m_colAt.IsEmpty() )
             {
 
             if ( !m_colAt.IsEmpty() )
             {


@@ -5412,7 +5402,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
             int numCols = msg.GetCommandInt2();
             m_numCols -= numCols;
             if ( m_useNativeHeader )
             int numCols = msg.GetCommandInt2();
             m_numCols -= numCols;
             if ( m_useNativeHeader )

-                GetColHeader()->SetColumnCount(m_numCols);
+                GetGridColHeader()->SetColumnCount(m_numCols);

 
             if ( !m_colAt.IsEmpty() )
             {
 
             if ( !m_colAt.IsEmpty() )
             {


@@ -5873,7 +5863,7 @@ void wxGrid::UpdateColumnSortingIndicator(int col)
     wxCHECK_RET( col != wxNOT_FOUND, "invalid column index" );
 
     if ( m_useNativeHeader )
     wxCHECK_RET( col != wxNOT_FOUND, "invalid column index" );
 
     if ( m_useNativeHeader )

-        GetColHeader()->UpdateColumn(col);
+        GetGridColHeader()->UpdateColumn(col);

     else if ( m_nativeColumnLabels )
         m_colWindow->Refresh();
     //else: sorting indicator display not yet implemented in grid version
     else if ( m_nativeColumnLabels )
         m_colWindow->Refresh();
     //else: sorting indicator display not yet implemented in grid version


@@ -6852,24 +6842,15 @@ void wxGrid::DoEndMoveCol(int pos)
     m_dragRowOrCol = -1;
 }
 
     m_dragRowOrCol = -1;
 }
 

-void wxGrid::SetColPos(int idx, int pos)
+void wxGrid::RefreshAfterColPosChange()

 {
 {

-    // we're going to need m_colAt now, initialize it if needed
-    if ( m_colAt.empty() )
-    {
-        m_colAt.reserve(m_numCols);
-        for ( int i = 0; i < m_numCols; i++ )
-            m_colAt.push_back(i);
-    }
-
-    wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);
-
-    // also recalculate the column rights
-    if ( !m_colWidths.IsEmpty() )
+    // recalculate the column rights as the column positions have changed,
+    // unless we calculate them dynamically because all columns widths are the
+    // same and it's easy to do
+    if ( !m_colWidths.empty() )

     {
         int colRight = 0;
     {
         int colRight = 0;

-        int colPos;
-        for ( colPos = 0; colPos < m_numCols; colPos++ )
+        for ( int colPos = 0; colPos < m_numCols; colPos++ )

         {
             int colID = GetColAt( colPos );
 
         {
             int colID = GetColAt( colPos );
 


@@ -6880,40 +6861,58 @@ void wxGrid::SetColPos(int idx, int pos)
 
     // and make the changes visible
     if ( m_useNativeHeader )
 
     // and make the changes visible
     if ( m_useNativeHeader )

-        GetColHeader()->SetColumnsOrder(m_colAt);
+    {
+        if ( m_colAt.empty() )
+            GetGridColHeader()->ResetColumnsOrder();
+        else
+            GetGridColHeader()->SetColumnsOrder(m_colAt);
+    }

     else
     else

+    {

         m_colWindow->Refresh();
         m_colWindow->Refresh();

+    }

     m_gridWin->Refresh();
 }
 
     m_gridWin->Refresh();
 }
 

+void wxGrid::SetColPos(int idx, int pos)
+{
+    // we're going to need m_colAt now, initialize it if needed
+    if ( m_colAt.empty() )
+    {
+        m_colAt.reserve(m_numCols);
+        for ( int i = 0; i < m_numCols; i++ )
+            m_colAt.push_back(i);
+    }
+
+    wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);

 
 

+    RefreshAfterColPosChange();
+}
+
+void wxGrid::ResetColPos()
+{
+    m_colAt.clear();
+
+    RefreshAfterColPosChange();
+}

 
 void wxGrid::EnableDragColMove( bool enable )
 {
     if ( m_canDragColMove == enable )
         return;
 
 
 void wxGrid::EnableDragColMove( bool enable )
 {
     if ( m_canDragColMove == enable )
         return;
 

-    m_canDragColMove = enable;
-
-    if ( !m_canDragColMove )
+    if ( m_useNativeHeader )

     {
     {

-        m_colAt.Clear();
+        // update all columns to make them [not] reorderable
+        GetGridColHeader()->SetColumnCount(m_numCols);
+    }

 
 

-        //Recalculate the column rights
-        if ( !m_colWidths.IsEmpty() )
-        {
-            int colRight = 0;
-            int colPos;
-            for ( colPos = 0; colPos < m_numCols; colPos++ )
-            {
-                colRight += m_colWidths[colPos];
-                m_colRights[colPos] = colRight;
-            }
-        }
+    m_canDragColMove = enable;

 
 

-        m_colWindow->Refresh();
-        m_gridWin->Refresh();
-    }
+    // we use to call ResetColPos() from here if !enable but this doesn't seem
+    // right as it would mean there would be no way to "freeze" the current
+    // columns order by disabling moving them after putting them in the desired
+    // order, whereas now you can always call ResetColPos() manually if needed

 }
 
 
 }
 
 


@@ -8190,7 +8189,7 @@ void wxGrid::UseNativeColHeader(bool native)
     CreateColumnWindow();
 
     if ( m_useNativeHeader )
     CreateColumnWindow();
 
     if ( m_useNativeHeader )

-        GetColHeader()->SetColumnCount(m_numCols);
+        GetGridColHeader()->SetColumnCount(m_numCols);

     CalcWindowSizes();
 }
 
     CalcWindowSizes();
 }
 


@@ -9574,7 +9573,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
         {
             if ( m_useNativeHeader )
             {
         {
             if ( m_useNativeHeader )
             {

-                GetColHeader()->UpdateColumn(col);
+                GetGridColHeader()->UpdateColumn(col);

             }
             else
             {
             }
             else
             {


@@ -10401,8 +10400,9 @@ void wxGrid::SetColSize( int col, int width )
     // we intentionally don't test whether the width is less than
     // GetColMinimalWidth() here but we do compare it with
     // GetColMinimalAcceptableWidth() as otherwise things currently break (see
     // we intentionally don't test whether the width is less than
     // GetColMinimalWidth() here but we do compare it with
     // GetColMinimalAcceptableWidth() as otherwise things currently break (see

-    // #651)
-    if ( width < GetColMinimalAcceptableWidth() )
+    // #651) -- and we also always allow the width of 0 as it has the special
+    // sense of hiding the column
+    if ( width > 0 && width < GetColMinimalAcceptableWidth() )

         return;
 
     if ( m_colWidths.IsEmpty() )
         return;
 
     if ( m_colWidths.IsEmpty() )


@@ -10411,9 +10411,11 @@ void wxGrid::SetColSize( int col, int width )
         InitColWidths();
     }
 
         InitColWidths();
     }
 

-    int w = wxMax( 0, width );
-    int diff = w - m_colWidths[col];
-    m_colWidths[col] = w;
+    const int diff = width - m_colWidths[col];
+    m_colWidths[col] = width;
+    if ( m_useNativeHeader )
+        GetGridColHeader()->UpdateColumn(col);
+    //else: will be refreshed when the header is redrawn

 
     for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )
     {
 
     for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )
     {


@@ -10579,7 +10581,7 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
         {
             if ( m_useNativeHeader )
             {
         {
             if ( m_useNativeHeader )
             {

-                GetColHeader()->UpdateColumn(col);
+                GetGridColHeader()->UpdateColumn(col);

             }
             else
             {
             }
             else
             {