correction to last commit: Korean and Romanian translations will only be in 2.9.1...

[wxWidgets.git] / samples / grid / griddemo.cpp

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index cff3f3b1fa40b36722458ba9503509bf99dc3ce6..c485fdfe4d15e8706a50474d1d5b0319875552f9 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -33,10 +33,16 @@
 #include "wx/aboutdlg.h"
 
 #include "wx/grid.h"
 #include "wx/aboutdlg.h"
 
 #include "wx/grid.h"

+#include "wx/headerctrl.h"

 #include "wx/generic/gridctrl.h"
 #include "wx/generic/gridctrl.h"

+#include "wx/generic/grideditors.h"

 
 #include "griddemo.h"
 
 
 #include "griddemo.h"
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -132,6 +138,7 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_GRID_COL_SIZE( GridFrame::OnColSize )
     EVT_GRID_SELECT_CELL( GridFrame::OnSelectCell )
     EVT_GRID_RANGE_SELECT( GridFrame::OnRangeSelected )
     EVT_GRID_COL_SIZE( GridFrame::OnColSize )
     EVT_GRID_SELECT_CELL( GridFrame::OnSelectCell )
     EVT_GRID_RANGE_SELECT( GridFrame::OnRangeSelected )

+    EVT_GRID_CELL_CHANGING( GridFrame::OnCellValueChanging )

     EVT_GRID_CELL_CHANGE( GridFrame::OnCellValueChanged )
     EVT_GRID_CELL_BEGIN_DRAG( GridFrame::OnCellBeginDrag )
 
     EVT_GRID_CELL_CHANGE( GridFrame::OnCellValueChanged )
     EVT_GRID_CELL_BEGIN_DRAG( GridFrame::OnCellBeginDrag )
 


@@ -145,6 +152,8 @@ GridFrame::GridFrame()
                    wxDefaultPosition,
                    wxDefaultSize )
 {
                    wxDefaultPosition,
                    wxDefaultSize )
 {

+    SetIcon(wxICON(sample));
+

     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append( ID_VTABLE, _T("&Virtual table test\tCtrl-V"));
     fileMenu->Append( ID_BUGS_TABLE, _T("&Bugs table test\tCtrl-B"));
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append( ID_VTABLE, _T("&Virtual table test\tCtrl-V"));
     fileMenu->Append( ID_BUGS_TABLE, _T("&Bugs table test\tCtrl-B"));


@@ -1058,13 +1067,36 @@ void GridFrame::OnRangeSelected( wxGridRangeSelectEvent& ev )
     ev.Skip();
 }
 
     ev.Skip();
 }
 

+void GridFrame::OnCellValueChanging( wxGridEvent& ev )
+{
+    int row = ev.GetRow(),
+        col = ev.GetCol();
+
+    wxLogMessage("Value of cell at (%d, %d): about to change "
+                 "from \"%s\" to \"%s\"",
+                 row, col,
+                 grid->GetCellValue(row, col), ev.GetString());
+
+    // test how vetoing works
+    if ( ev.GetString() == "42" )
+    {
+        wxLogMessage("Vetoing the change.");
+        ev.Veto();
+        return;
+    }
+
+    ev.Skip();
+}
+

 void GridFrame::OnCellValueChanged( wxGridEvent& ev )
 {
     int row = ev.GetRow(),
         col = ev.GetCol();
 
 void GridFrame::OnCellValueChanged( wxGridEvent& ev )
 {
     int row = ev.GetRow(),
         col = ev.GetCol();
 

-    wxLogMessage(_T("Value changed for cell at row %d, col %d: now \"%s\""),
-                 row, col, grid->GetCellValue(row, col).c_str());
+    wxLogMessage("Value of cell at (%d, %d) changed and is now \"%s\" "
+                 "(was \"%s\")",
+                 row, col,
+                 grid->GetCellValue(row, col), ev.GetString());

 
     ev.Skip();
 }
 
     ev.Skip();
 }


@@ -1120,6 +1152,13 @@ void GridFrame::About(  wxCommandEvent& WXUNUSED(ev) )
     aboutInfo.AddDeveloper(wxT("Julian Smart"));
     aboutInfo.AddDeveloper(wxT("Vadim Zeitlin"));
 
     aboutInfo.AddDeveloper(wxT("Julian Smart"));
     aboutInfo.AddDeveloper(wxT("Vadim Zeitlin"));
 

+    // this is just to force the generic version of the about
+    // dialog under wxMSW so that it's easy to test if the grid
+    // repaints correctly when it has lost focus and a dialog
+    // (different from the Windows standard message box -- it doesn't
+    // work with it for some reason) is moved over it.
+    aboutInfo.SetWebSite(wxT("http://www.wxwidgets.org"));
+

     wxAboutBox(aboutInfo);
 }
 
     wxAboutBox(aboutInfo);
 }
 


@@ -1740,6 +1779,18 @@ private:
         m_grid->EnableDragColMove(m_chkEnableColMove->IsChecked());
     }
 
         m_grid->EnableDragColMove(m_chkEnableColMove->IsChecked());
     }
 

+    void OnShowHideColumn(wxCommandEvent& event)
+    {
+        int col = m_txtColShowHide->GetCol();
+        if ( col != -1 )
+        {
+            m_grid->SetColSize(col,
+                               event.GetId() == wxID_ADD ? wxGRID_AUTOSIZE : 0);
+
+            UpdateOrderAndVisibility();
+        }
+    }
+

     void OnMoveColumn(wxCommandEvent&)
     {
         int col = m_txtColIndex->GetCol();
     void OnMoveColumn(wxCommandEvent&)
     {
         int col = m_txtColIndex->GetCol();


@@ -1749,7 +1800,14 @@ private:
 
         m_grid->SetColPos(col, pos);
 
 
         m_grid->SetColPos(col, pos);
 

-        UpdateOrder();
+        UpdateOrderAndVisibility();
+    }
+
+    void OnResetColumnOrder(wxCommandEvent&)
+    {
+        m_grid->ResetColPos();
+
+        UpdateOrderAndVisibility();

     }
 
     void OnGridColSort(wxGridEvent& event)
     }
 
     void OnGridColSort(wxGridEvent& event)


@@ -1768,22 +1826,43 @@ private:
         event.Skip();
     }
 
         event.Skip();
     }
 

+    void OnGridColSize(wxGridSizeEvent& event)
+    {
+        // we only catch this event to react to the user showing or hiding this
+        // column using the header control menu and not because we're
+        // interested in column resizing
+        UpdateOrderAndVisibility();
+
+        event.Skip();
+    }
+

     void OnIdle(wxIdleEvent& event)
     {
         if ( m_shouldUpdateOrder )
         {
             m_shouldUpdateOrder = false;
     void OnIdle(wxIdleEvent& event)
     {
         if ( m_shouldUpdateOrder )
         {
             m_shouldUpdateOrder = false;

-            UpdateOrder();
+            UpdateOrderAndVisibility();

         }
 
         event.Skip();
     }
 
         }
 
         event.Skip();
     }
 

-    void UpdateOrder()
+    void UpdateOrderAndVisibility()

     {
         wxString s;
         for ( int pos = 0; pos < TabularGridTable::COL_MAX; pos++ )
     {
         wxString s;
         for ( int pos = 0; pos < TabularGridTable::COL_MAX; pos++ )

-            s << m_grid->GetColAt(pos) << ' ';
+        {
+            const int col = m_grid->GetColAt(pos);
+            const bool isHidden = m_grid->GetColSize(col) == 0;
+
+            if ( isHidden )
+                s << '[';
+            s << col;
+            if ( isHidden )
+                s << ']';
+
+            s << ' ';
+        }

 
         m_statOrder->SetLabel(s);
     }
 
         m_statOrder->SetLabel(s);
     }


@@ -1797,14 +1876,15 @@ private:
                *m_chkEnableColMove;
 
     ColIndexEntry *m_txtColIndex,
                *m_chkEnableColMove;
 
     ColIndexEntry *m_txtColIndex,

-                  *m_txtColPos;
+                  *m_txtColPos,
+                  *m_txtColShowHide;

 
     wxStaticText *m_statOrder;
 
     // fla for EVT_IDLE handler
     bool m_shouldUpdateOrder;
 
 
     wxStaticText *m_statOrder;
 
     // fla for EVT_IDLE handler
     bool m_shouldUpdateOrder;
 

-    DECLARE_NO_COPY_CLASS(TabularGridFrame)
+    wxDECLARE_NO_COPY_CLASS(TabularGridFrame);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -1822,9 +1902,13 @@ BEGIN_EVENT_TABLE(TabularGridFrame, wxFrame)
                   TabularGridFrame::OnUpdateDrawNativeLabelsUI)
 
     EVT_BUTTON(wxID_APPLY, TabularGridFrame::OnMoveColumn)
                   TabularGridFrame::OnUpdateDrawNativeLabelsUI)
 
     EVT_BUTTON(wxID_APPLY, TabularGridFrame::OnMoveColumn)

+    EVT_BUTTON(wxID_RESET, TabularGridFrame::OnResetColumnOrder)
+    EVT_BUTTON(wxID_ADD, TabularGridFrame::OnShowHideColumn)
+    EVT_BUTTON(wxID_DELETE, TabularGridFrame::OnShowHideColumn)

 
     EVT_GRID_COL_SORT(TabularGridFrame::OnGridColSort)
     EVT_GRID_COL_MOVE(TabularGridFrame::OnGridColMove)
 
     EVT_GRID_COL_SORT(TabularGridFrame::OnGridColSort)
     EVT_GRID_COL_MOVE(TabularGridFrame::OnGridColMove)

+    EVT_GRID_COL_SIZE(TabularGridFrame::OnGridColSize)

 
     EVT_IDLE(TabularGridFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(TabularGridFrame::OnIdle)
 END_EVENT_TABLE()


@@ -1893,10 +1977,20 @@ TabularGridFrame::TabularGridFrame()
     wxSizer * const sizerShowCols = new wxBoxSizer(wxHORIZONTAL);
     sizerShowCols->Add(new wxStaticText(panel, wxID_ANY, "Current order:"),
                        flagsHorz);
     wxSizer * const sizerShowCols = new wxBoxSizer(wxHORIZONTAL);
     sizerShowCols->Add(new wxStaticText(panel, wxID_ANY, "Current order:"),
                        flagsHorz);

-    m_statOrder = new wxStaticText(panel, wxID_ANY, "<default>");
+    m_statOrder = new wxStaticText(panel, wxID_ANY, "<<< default >>>");

     sizerShowCols->Add(m_statOrder, flagsHorz);
     sizerShowCols->Add(m_statOrder, flagsHorz);

+    sizerShowCols->Add(new wxButton(panel, wxID_RESET, "&Reset order"));

     sizerColumns->Add(sizerShowCols, wxSizerFlags().Expand().Border(wxTOP));
 
     sizerColumns->Add(sizerShowCols, wxSizerFlags().Expand().Border(wxTOP));
 

+    wxSizer * const sizerShowHide = new wxBoxSizer(wxHORIZONTAL);
+    sizerShowHide->Add(new wxStaticText(panel, wxID_ANY, "Show/hide column:"),
+                       flagsHorz);
+    m_txtColShowHide = new ColIndexEntry(panel);
+    sizerShowHide->Add(m_txtColShowHide, flagsHorz);
+    sizerShowHide->Add(new wxButton(panel, wxID_ADD, "&Show"), flagsHorz);
+    sizerShowHide->Add(new wxButton(panel, wxID_DELETE, "&Hide"), flagsHorz);
+    sizerColumns->Add(sizerShowHide, wxSizerFlags().Expand().Border(wxTOP));
+

     sizerControls->Add(sizerColumns, wxSizerFlags(1).Expand().Border());
 
     sizerTop->Add(sizerControls, wxSizerFlags().Expand().Border());
     sizerControls->Add(sizerColumns, wxSizerFlags(1).Expand().Border());
 
     sizerTop->Add(sizerControls, wxSizerFlags().Expand().Border());


@@ -1913,10 +2007,3 @@ void GridFrame::OnTabularTable(wxCommandEvent&)
 {
     new TabularGridFrame;
 }
 {
     new TabularGridFrame;
 }

-
-bool GridApp::OnInit()
-{
-    new TabularGridFrame();
-
-    return true;
-}