From 0ba143c9a0ce7cfe812d248d5afee1c377ccaaee Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 21 Feb 2000 23:22:40 +0000 Subject: [PATCH] forgot to uncomment a few things git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/grid.h | 4 ++-- src/generic/grid.cpp | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index ee7e4f9424..bc92de5093 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -890,9 +890,9 @@ public: wxGridCellRenderer* GetCellRenderer(int row, int col); // takes ownership of the pointer -// void SetDefaultEditor(wxGridCellEditor *editor); + void SetDefaultEditor(wxGridCellEditor *editor); void SetCellEditor(int row, int col, wxGridCellEditor *editor); -// wxGridCellEditor *GetDefaultEditor() const; + wxGridCellEditor *GetDefaultEditor() const; wxGridCellEditor* GetCellEditor(int row, int col); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 75cecfcf35..664efa84d4 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -5866,15 +5866,15 @@ void wxGrid::SetDefaultCellFont( const wxFont& font ) m_defaultCellAttr->SetFont(font); } -// void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) -// { -// m_defaultCellAttr->SetRenderer(renderer); -// } +void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) +{ + m_defaultCellAttr->SetRenderer(renderer); +} -// void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) -// { -// m_defaultCellAttr->SetEditor(editor); -// } +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); +} // ---------------------------------------------------------------------------- // access to the default attrbiutes @@ -5900,15 +5900,15 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) m_defaultCellAttr->GetAlignment(horiz, vert); } -// wxGridCellRenderer *wxGrid::GetDefaultRenderer() const -// { -// return m_defaultCellAttr->GetRenderer(); -// } +wxGridCellRenderer *wxGrid::GetDefaultRenderer() const +{ + return m_defaultCellAttr->GetRenderer(NULL); +} -// wxGridCellEditor *wxGrid::GetDefaultEditor() const -// { -// return m_defaultCellAttr->GetEditor(); -// } +wxGridCellEditor *wxGrid::GetDefaultEditor() const +{ + return m_defaultCellAttr->GetEditor(NULL); +} // ---------------------------------------------------------------------------- // access to cell attributes