Gobs of changes needed to get up to date with today's CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 00:57:21 +00:00
parent bb9e79c05e
commit 8f514ab459
57 changed files with 5361 additions and 1497 deletions
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -82,6 +82,7 @@ public:
    int GetQuality();
    wxPrintBin GetBin();
    wxPrintMode GetPrintMode() const;
+    int GetMedia() const;
    
    void SetNoCopies(int v);
    void SetCollate(bool flag);
@@ -95,7 +96,8 @@ public:
    void SetQuality(int quality);
    void SetBin(wxPrintBin bin);
    void SetPrintMode(wxPrintMode printMode);
- 
+    void SetMedia(int media);
+    
    wxString GetFilename() const;
    void SetFilename( const wxString &filename );