Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 7dda39b598b6bf14ebfd264bc434974f29e2ecea..93b1d9515534880adfdbcf8da9e2a601c3d14a55 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -200,7 +200,6 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame )
     EVT_MENU( ID_SELECT_ROW, GridFrame::SelectRow)
     EVT_MENU( ID_SELECT_ALL, GridFrame::SelectAll)
     EVT_MENU( ID_SELECT_UNSELECT, GridFrame::OnAddToSelectToggle)
     EVT_MENU( ID_SELECT_ROW, GridFrame::SelectRow)
     EVT_MENU( ID_SELECT_ALL, GridFrame::SelectAll)
     EVT_MENU( ID_SELECT_UNSELECT, GridFrame::OnAddToSelectToggle)

-    EVT_MENU( ID_SHOW_SELECTION, GridFrame::OnShowSelection)

 
     EVT_MENU( ID_SIZE_ROW, GridFrame::AutoSizeRow )
     EVT_MENU( ID_SIZE_COL, GridFrame::AutoSizeCol )
 
     EVT_MENU( ID_SIZE_ROW, GridFrame::AutoSizeRow )
     EVT_MENU( ID_SIZE_COL, GridFrame::AutoSizeCol )


@@ -306,8 +305,6 @@ GridFrame::GridFrame()
     selectMenu->Append( ID_SELECT_UNSELECT, wxT("Add new cells to the selection"),
                         wxT("When off, old selection is deselected before ")
                         wxT("selecting the new cells"), wxITEM_CHECK );
     selectMenu->Append( ID_SELECT_UNSELECT, wxT("Add new cells to the selection"),
                         wxT("When off, old selection is deselected before ")
                         wxT("selecting the new cells"), wxITEM_CHECK );

-    selectMenu->Append( ID_SHOW_SELECTION,
-                        wxT("&Show current selection\tCtrl-Alt-S"));

     selectMenu->AppendSeparator();
     selectMenu->Append( ID_SELECT_ALL, wxT("Select all"));
     selectMenu->Append( ID_SELECT_ROW, wxT("Select row 2"));
     selectMenu->AppendSeparator();
     selectMenu->Append( ID_SELECT_ALL, wxT("Select all"));
     selectMenu->Append( ID_SELECT_ROW, wxT("Select row 2"));


@@ -474,7 +471,7 @@ GridFrame::GridFrame()
     grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE);
     grid->SetCellValue(7, 1, wxT("Big box!"));
 
     grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE);
     grid->SetCellValue(7, 1, wxT("Big box!"));
 

-    // create a separator-like row: it's grey and it's non-resizeable
+    // create a separator-like row: it's grey and it's non-resizable

     grid->DisableRowResize(10);
     grid->SetRowSize(10, 30);
     attr = new wxGridCellAttr;
     grid->DisableRowResize(10);
     grid->SetRowSize(10, 30);
     attr = new wxGridCellAttr;


@@ -705,7 +702,7 @@ void GridFrame::SetLabelTextColour( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetLabelFont( wxCommandEvent& WXUNUSED(ev) )
 {
     wxFont font = wxGetFontFromUser(this);
 void GridFrame::SetLabelFont( wxCommandEvent& WXUNUSED(ev) )
 {
     wxFont font = wxGetFontFromUser(this);

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         grid->SetLabelFont(font);
     }
     {
         grid->SetLabelFont(font);
     }


@@ -948,7 +945,7 @@ void GridFrame::SelectRowsOrCols( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColour col = wxGetColourFromUser(this);
 void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColour col = wxGetColourFromUser(this);

-    if ( col.Ok() )
+    if ( col.IsOk() )

     {
         grid->SetDefaultCellTextColour(col);
         grid->Refresh();
     {
         grid->SetDefaultCellTextColour(col);
         grid->Refresh();


@@ -958,7 +955,7 @@ void GridFrame::SetCellFgColour( wxCommandEvent& WXUNUSED(ev) )
 void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColour col = wxGetColourFromUser(this);
 void GridFrame::SetCellBgColour( wxCommandEvent& WXUNUSED(ev) )
 {
     wxColour col = wxGetColourFromUser(this);

-    if ( col.Ok() )
+    if ( col.IsOk() )

     {
         // Check the new Refresh function by passing it a rectangle
         // which exactly fits the grid.
     {
         // Check the new Refresh function by passing it a rectangle
         // which exactly fits the grid.


@@ -1075,82 +1072,6 @@ void GridFrame::OnColSize( wxGridSizeEvent& ev )
 }
 
 
 }
 
 

-void GridFrame::OnShowSelection(wxCommandEvent& WXUNUSED(event))
-{
-    // max number of elements to dump -- otherwise it can take too much time
-    static const size_t countMax = 100;
-
-    bool rows = false;
-
-    switch ( grid->GetSelectionMode() )
-    {
-        case wxGrid::wxGridSelectCells:
-            {
-                const wxGridCellCoordsArray cells(grid->GetSelectedCells());
-                size_t count = cells.size();
-                wxLogMessage(wxT("%lu cells selected:"), (unsigned long)count);
-                if ( count > countMax )
-                {
-                    wxLogMessage(wxT("[too many selected cells, ")
-                                 wxT("showing only the first %lu]"),
-                                 (unsigned long)countMax);
-                    count = countMax;
-                }
-
-                for ( size_t n = 0; n < count; n++ )
-                {
-                    const wxGridCellCoords& c = cells[n];
-                    wxLogMessage(wxT("  selected cell %lu: (%d, %d)"),
-                                 (unsigned long)n, c.GetCol(), c.GetRow());
-                }
-            }
-            break;
-
-        case wxGrid::wxGridSelectRows:
-            rows = true;
-            // fall through
-
-        case wxGrid::wxGridSelectColumns:
-            {
-                const wxChar *plural, *single;
-                if ( rows )
-                {
-                    plural = wxT("rows");
-                    single = wxT("row");
-                }
-                else // columns
-                {
-                    plural = wxT("columns");
-                    single = wxT("column");
-                }
-
-                const wxArrayInt sels((const wxArrayInt)(rows ? grid->GetSelectedRows()
-                                           : grid->GetSelectedCols()));
-                size_t count = sels.size();
-                wxLogMessage(wxT("%lu %s selected:"),
-                             (unsigned long)count, plural);
-                if ( count > countMax )
-                {
-                    wxLogMessage(wxT("[too many selected %s, ")
-                                 wxT("showing only the first %lu]"),
-                                 plural, (unsigned long)countMax);
-                    count = countMax;
-                }
-
-                for ( size_t n = 0; n < count; n++ )
-                {
-                    wxLogMessage(wxT("  selected %s %lu: %d"),
-                                 single, (unsigned long)n, sels[n]);
-                }
-            }
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("unknown wxGrid selection mode") );
-            break;
-    }
-}
-

 void GridFrame::OnSelectCell( wxGridEvent& ev )
 {
     wxString logBuf;
 void GridFrame::OnSelectCell( wxGridEvent& ev )
 {
     wxString logBuf;