second merge of the 2.2 branch (RL)

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

wxPython/demo/GridSimple.py

@@ -30,6 +30,9 @@ class SimpleGrid(wxGrid):
         # you can set cell attributes for the whole row (or column)
         self.SetRowAttr(5, attr)
 
+        self.SetColLabelValue(0, "Custom")
+        self.SetColLabelValue(1, "column")
+        self.SetColLabelValue(2, "labels")
 
         # test all the events
         EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)