forgot to uncomment a few things

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index ee7e4f9424f65e4cf0dc46c42c6e8d1451f5804f..bc92de5093960139f81ee9d40e943310871e58c1 100644 (file)
--- 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
     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);
     void SetCellEditor(int row, int col, wxGridCellEditor *editor);

-//    wxGridCellEditor *GetDefaultEditor() const;
+    wxGridCellEditor *GetDefaultEditor() const;

     wxGridCellEditor* GetCellEditor(int row, int col);
 
 
     wxGridCellEditor* GetCellEditor(int row, int col);
 
 

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 75cecfcf35d8e46ad89029a411342949587f7a33..664efa84d4a27973967b09250cf3f29612c273c5 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5866,15 +5866,15 @@ void wxGrid::SetDefaultCellFont( const wxFont& font )
     m_defaultCellAttr->SetFont(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
 
 // ----------------------------------------------------------------------------
 // access to the default attrbiutes


@@ -5900,15 +5900,15 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
     m_defaultCellAttr->GetAlignment(horiz, 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
 
 // ----------------------------------------------------------------------------
 // access to cell attributes