Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions
--- a/wxPython/include/wx/wxPython/printfw.h
+++ b/wxPython/include/wx/wxPython/printfw.h
@@ -35,7 +35,7 @@ public:
    void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);

    PYPRIVATE;
-    DECLARE_ABSTRACT_CLASS(wxPyPrintout); 
+    DECLARE_ABSTRACT_CLASS(wxPyPrintout)
 };

 #endif