corrected wxListCtrl compilation problems

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 6656631d388d99da10cc1d2646ae13beb9b6dcfb..da9d2dcdcdfe2668ca5a58711bb3747544655c50 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -539,7 +539,6 @@ class wxListCtrl: public wxControl
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       long style = 0, const wxString &name = "listctrl" );
     void OnSize( wxSizeEvent &event );
-    void SetBackgroundColour( const wxColour& col );
     bool GetColumn( int col, wxListItem& item );
     bool SetColumn( int col, wxListItem& item );
     int GetColumnWidth( int col );
@@ -606,13 +605,13 @@ class wxListCtrl: public wxControl
     wxColour GetBackgroundColour() const
       { return m_mainWin->GetBackgroundColour(); }
     void SetBackgroundColour( const wxColour &colour )
-      { m_mainWin->SetBackgroundColour(); }
+      { m_mainWin->SetBackgroundColour(colour); }
     wxColour GetForegroundColour() const
       { return m_mainWin->GetForegroundColour(); }
     void SetForegroundColour( const wxColour &colour )
-      { return m_mainWin->GetForegroundColour(); }
+      { m_mainWin->SetForegroundColour(colour); }
     bool PopupMenu( wxMenu *menu, int x, int y )
-      { m_mainWin->PopupMenu( menu, x, y ); }
+      { return m_mainWin->PopupMenu( menu, x, y ); }
 
   protected:
 

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 2fcf5a080dc58e71253c0f1aca7fec474a4e2b0c..84e0770e144deb81ba1e0cc8178edb89373b7ef4 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2204,13 +2204,6 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
   wxWindow::SetWindowStyleFlag( flag );
 };
 
-void wxListCtrl::SetBackgroundColour(const wxColour& col)
-{
-  // This is from Julian. You know.
-  // Not in wxWin 1.xx ???
-  wxWindow::SetBackgroundColour( (wxColour&)col );
-};
-
 bool wxListCtrl::GetColumn(int col, wxListItem &item) 
 {
   m_mainWin->GetColumn( col, item );