Elippsis and markup support for wxStaticText

[wxWidgets.git] / wxPython / src / msw / _windows_wrap.cpp

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index ab57bee34ac31b1889397cc4e51c24fe5f704713..21101e1a8a65b0e39e811de848413a3e28207c44 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -2474,162 +2474,167 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxAcceleratorTable swig_types[8]
 #define SWIGTYPE_p_wxActivateEvent swig_types[9]
 #define SWIGTYPE_p_wxArrayInt swig_types[10]
 #define SWIGTYPE_p_wxAcceleratorTable swig_types[8]
 #define SWIGTYPE_p_wxActivateEvent swig_types[9]
 #define SWIGTYPE_p_wxArrayInt swig_types[10]

-#define SWIGTYPE_p_wxBMPHandler swig_types[11]
-#define SWIGTYPE_p_wxBitmap swig_types[12]
-#define SWIGTYPE_p_wxBoxSizer swig_types[13]
-#define SWIGTYPE_p_wxCURHandler swig_types[14]
-#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[15]
-#define SWIGTYPE_p_wxChildFocusEvent swig_types[16]
-#define SWIGTYPE_p_wxClipboardTextEvent swig_types[17]
-#define SWIGTYPE_p_wxCloseEvent swig_types[18]
-#define SWIGTYPE_p_wxColour swig_types[19]
-#define SWIGTYPE_p_wxColourData swig_types[20]
-#define SWIGTYPE_p_wxColourDialog swig_types[21]
-#define SWIGTYPE_p_wxCommandEvent swig_types[22]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[23]
-#define SWIGTYPE_p_wxControl swig_types[24]
-#define SWIGTYPE_p_wxControlWithItems swig_types[25]
-#define SWIGTYPE_p_wxDC swig_types[26]
-#define SWIGTYPE_p_wxDateEvent swig_types[27]
-#define SWIGTYPE_p_wxDialog swig_types[28]
-#define SWIGTYPE_p_wxDirDialog swig_types[29]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[30]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[31]
-#define SWIGTYPE_p_wxDuplexMode swig_types[32]
-#define SWIGTYPE_p_wxEraseEvent swig_types[33]
-#define SWIGTYPE_p_wxEvent swig_types[34]
-#define SWIGTYPE_p_wxEvtHandler swig_types[35]
-#define SWIGTYPE_p_wxFSFile swig_types[36]
-#define SWIGTYPE_p_wxFileDialog swig_types[37]
-#define SWIGTYPE_p_wxFileSystem swig_types[38]
-#define SWIGTYPE_p_wxFindDialogEvent swig_types[39]
-#define SWIGTYPE_p_wxFindReplaceData swig_types[40]
-#define SWIGTYPE_p_wxFindReplaceDialog swig_types[41]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[42]
-#define SWIGTYPE_p_wxFocusEvent swig_types[43]
-#define SWIGTYPE_p_wxFont swig_types[44]
-#define SWIGTYPE_p_wxFontData swig_types[45]
-#define SWIGTYPE_p_wxFontDialog swig_types[46]
-#define SWIGTYPE_p_wxFrame swig_types[47]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[48]
-#define SWIGTYPE_p_wxGIFHandler swig_types[49]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[50]
-#define SWIGTYPE_p_wxGridSizer swig_types[51]
-#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[52]
-#define SWIGTYPE_p_wxICOHandler swig_types[53]
-#define SWIGTYPE_p_wxIcon swig_types[54]
-#define SWIGTYPE_p_wxIconBundle swig_types[55]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[56]
-#define SWIGTYPE_p_wxIdleEvent swig_types[57]
-#define SWIGTYPE_p_wxImage swig_types[58]
-#define SWIGTYPE_p_wxImageHandler swig_types[59]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[60]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[61]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[62]
-#define SWIGTYPE_p_wxKeyEvent swig_types[63]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[64]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[65]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[66]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[67]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[68]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[69]
-#define SWIGTYPE_p_wxMenu swig_types[70]
-#define SWIGTYPE_p_wxMenuBar swig_types[71]
-#define SWIGTYPE_p_wxMenuEvent swig_types[72]
-#define SWIGTYPE_p_wxMenuItem swig_types[73]
-#define SWIGTYPE_p_wxMessageDialog swig_types[74]
-#define SWIGTYPE_p_wxMiniFrame swig_types[75]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[76]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[77]
-#define SWIGTYPE_p_wxMouseEvent swig_types[78]
-#define SWIGTYPE_p_wxMoveEvent swig_types[79]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[80]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[81]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[82]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[83]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[84]
-#define SWIGTYPE_p_wxObject swig_types[85]
-#define SWIGTYPE_p_wxPCXHandler swig_types[86]
-#define SWIGTYPE_p_wxPNGHandler swig_types[87]
-#define SWIGTYPE_p_wxPNMHandler swig_types[88]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[89]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[90]
-#define SWIGTYPE_p_wxPaintEvent swig_types[91]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[92]
-#define SWIGTYPE_p_wxPanel swig_types[93]
-#define SWIGTYPE_p_wxPaperSize swig_types[94]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[95]
-#define SWIGTYPE_p_wxPoint swig_types[96]
-#define SWIGTYPE_p_wxPopupWindow swig_types[97]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[98]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[99]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[100]
-#define SWIGTYPE_p_wxPrintData swig_types[101]
-#define SWIGTYPE_p_wxPrintDialog swig_types[102]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[103]
-#define SWIGTYPE_p_wxPrintPreview swig_types[104]
-#define SWIGTYPE_p_wxPrinter swig_types[105]
-#define SWIGTYPE_p_wxProgressDialog swig_types[106]
-#define SWIGTYPE_p_wxPyApp swig_types[107]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[108]
-#define SWIGTYPE_p_wxPyEvent swig_types[109]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[110]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[111]
-#define SWIGTYPE_p_wxPyPanel swig_types[112]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[113]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[114]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[115]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[116]
-#define SWIGTYPE_p_wxPyPrintout swig_types[117]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[118]
-#define SWIGTYPE_p_wxPySizer swig_types[119]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[120]
-#define SWIGTYPE_p_wxPyVListBox swig_types[121]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[122]
-#define SWIGTYPE_p_wxPyValidator swig_types[123]
-#define SWIGTYPE_p_wxPyWindow swig_types[124]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[125]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[126]
-#define SWIGTYPE_p_wxRect swig_types[127]
-#define SWIGTYPE_p_wxRegion swig_types[128]
-#define SWIGTYPE_p_wxSashEvent swig_types[129]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[130]
-#define SWIGTYPE_p_wxSashWindow swig_types[131]
-#define SWIGTYPE_p_wxScrollEvent swig_types[132]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[133]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[134]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[135]
-#define SWIGTYPE_p_wxShowEvent swig_types[136]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[137]
-#define SWIGTYPE_p_wxSize swig_types[138]
-#define SWIGTYPE_p_wxSizeEvent swig_types[139]
-#define SWIGTYPE_p_wxSizer swig_types[140]
-#define SWIGTYPE_p_wxSizerItem swig_types[141]
-#define SWIGTYPE_p_wxSplashScreen swig_types[142]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[143]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[144]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[145]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[146]
-#define SWIGTYPE_p_wxStatusBar swig_types[147]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[148]
-#define SWIGTYPE_p_wxString swig_types[149]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[150]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[151]
-#define SWIGTYPE_p_wxTaskBarIcon swig_types[152]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[153]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[154]
-#define SWIGTYPE_p_wxTipWindow swig_types[155]
-#define SWIGTYPE_p_wxToolBar swig_types[156]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[157]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[158]
-#define SWIGTYPE_p_wxValidator swig_types[159]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[160]
-#define SWIGTYPE_p_wxWindow swig_types[161]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[162]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[163]
-#define SWIGTYPE_p_wxXPMHandler swig_types[164]
-static swig_type_info *swig_types[166];
-static swig_module_info swig_module = {swig_types, 165, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxArrayString swig_types[11]
+#define SWIGTYPE_p_wxBMPHandler swig_types[12]
+#define SWIGTYPE_p_wxBitmap swig_types[13]
+#define SWIGTYPE_p_wxBoxSizer swig_types[14]
+#define SWIGTYPE_p_wxCURHandler swig_types[15]
+#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[16]
+#define SWIGTYPE_p_wxChildFocusEvent swig_types[17]
+#define SWIGTYPE_p_wxClipboardTextEvent swig_types[18]
+#define SWIGTYPE_p_wxCloseEvent swig_types[19]
+#define SWIGTYPE_p_wxColour swig_types[20]
+#define SWIGTYPE_p_wxColourData swig_types[21]
+#define SWIGTYPE_p_wxColourDialog swig_types[22]
+#define SWIGTYPE_p_wxCommandEvent swig_types[23]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[24]
+#define SWIGTYPE_p_wxControl swig_types[25]
+#define SWIGTYPE_p_wxControlWithItems swig_types[26]
+#define SWIGTYPE_p_wxDC swig_types[27]
+#define SWIGTYPE_p_wxDateEvent swig_types[28]
+#define SWIGTYPE_p_wxDialog swig_types[29]
+#define SWIGTYPE_p_wxDirDialog swig_types[30]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[31]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[32]
+#define SWIGTYPE_p_wxDuplexMode swig_types[33]
+#define SWIGTYPE_p_wxEraseEvent swig_types[34]
+#define SWIGTYPE_p_wxEvent swig_types[35]
+#define SWIGTYPE_p_wxEventBlocker swig_types[36]
+#define SWIGTYPE_p_wxEvtHandler swig_types[37]
+#define SWIGTYPE_p_wxFSFile swig_types[38]
+#define SWIGTYPE_p_wxFileDialog swig_types[39]
+#define SWIGTYPE_p_wxFileSystem swig_types[40]
+#define SWIGTYPE_p_wxFindDialogEvent swig_types[41]
+#define SWIGTYPE_p_wxFindReplaceData swig_types[42]
+#define SWIGTYPE_p_wxFindReplaceDialog swig_types[43]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[44]
+#define SWIGTYPE_p_wxFocusEvent swig_types[45]
+#define SWIGTYPE_p_wxFont swig_types[46]
+#define SWIGTYPE_p_wxFontData swig_types[47]
+#define SWIGTYPE_p_wxFontDialog swig_types[48]
+#define SWIGTYPE_p_wxFrame swig_types[49]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[50]
+#define SWIGTYPE_p_wxGIFHandler swig_types[51]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[52]
+#define SWIGTYPE_p_wxGridSizer swig_types[53]
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[54]
+#define SWIGTYPE_p_wxICOHandler swig_types[55]
+#define SWIGTYPE_p_wxIcon swig_types[56]
+#define SWIGTYPE_p_wxIconBundle swig_types[57]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[58]
+#define SWIGTYPE_p_wxIdleEvent swig_types[59]
+#define SWIGTYPE_p_wxImage swig_types[60]
+#define SWIGTYPE_p_wxImageHandler swig_types[61]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[62]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[63]
+#define SWIGTYPE_p_wxItemContainer swig_types[64]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[65]
+#define SWIGTYPE_p_wxKeyEvent swig_types[66]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[67]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[68]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[69]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[70]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[71]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[72]
+#define SWIGTYPE_p_wxMenu swig_types[73]
+#define SWIGTYPE_p_wxMenuBar swig_types[74]
+#define SWIGTYPE_p_wxMenuEvent swig_types[75]
+#define SWIGTYPE_p_wxMenuItem swig_types[76]
+#define SWIGTYPE_p_wxMessageDialog swig_types[77]
+#define SWIGTYPE_p_wxMiniFrame swig_types[78]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[79]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[80]
+#define SWIGTYPE_p_wxMouseEvent swig_types[81]
+#define SWIGTYPE_p_wxMoveEvent swig_types[82]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[83]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[84]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[85]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[86]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[87]
+#define SWIGTYPE_p_wxObject swig_types[88]
+#define SWIGTYPE_p_wxPCXHandler swig_types[89]
+#define SWIGTYPE_p_wxPNGHandler swig_types[90]
+#define SWIGTYPE_p_wxPNMHandler swig_types[91]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[92]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[93]
+#define SWIGTYPE_p_wxPaintEvent swig_types[94]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[95]
+#define SWIGTYPE_p_wxPanel swig_types[96]
+#define SWIGTYPE_p_wxPaperSize swig_types[97]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[98]
+#define SWIGTYPE_p_wxPoint swig_types[99]
+#define SWIGTYPE_p_wxPopupWindow swig_types[100]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[101]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[102]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[103]
+#define SWIGTYPE_p_wxPrintData swig_types[104]
+#define SWIGTYPE_p_wxPrintDialog swig_types[105]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[106]
+#define SWIGTYPE_p_wxPrintPreview swig_types[107]
+#define SWIGTYPE_p_wxPrinter swig_types[108]
+#define SWIGTYPE_p_wxProgressDialog swig_types[109]
+#define SWIGTYPE_p_wxPyApp swig_types[110]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[111]
+#define SWIGTYPE_p_wxPyEvent swig_types[112]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[113]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[114]
+#define SWIGTYPE_p_wxPyPanel swig_types[115]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[116]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[117]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[118]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[119]
+#define SWIGTYPE_p_wxPyPrintout swig_types[120]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[121]
+#define SWIGTYPE_p_wxPySizer swig_types[122]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[123]
+#define SWIGTYPE_p_wxPyVListBox swig_types[124]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[125]
+#define SWIGTYPE_p_wxPyValidator swig_types[126]
+#define SWIGTYPE_p_wxPyWindow swig_types[127]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[128]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[129]
+#define SWIGTYPE_p_wxRect swig_types[130]
+#define SWIGTYPE_p_wxRegion swig_types[131]
+#define SWIGTYPE_p_wxSashEvent swig_types[132]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[133]
+#define SWIGTYPE_p_wxSashWindow swig_types[134]
+#define SWIGTYPE_p_wxScrollEvent swig_types[135]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[136]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[137]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[138]
+#define SWIGTYPE_p_wxShowEvent swig_types[139]
+#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[140]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[141]
+#define SWIGTYPE_p_wxSize swig_types[142]
+#define SWIGTYPE_p_wxSizeEvent swig_types[143]
+#define SWIGTYPE_p_wxSizer swig_types[144]
+#define SWIGTYPE_p_wxSizerItem swig_types[145]
+#define SWIGTYPE_p_wxSplashScreen swig_types[146]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[147]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[148]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[149]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[150]
+#define SWIGTYPE_p_wxStatusBar swig_types[151]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[152]
+#define SWIGTYPE_p_wxString swig_types[153]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[154]
+#define SWIGTYPE_p_wxTGAHandler swig_types[155]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[156]
+#define SWIGTYPE_p_wxTaskBarIcon swig_types[157]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[158]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[159]
+#define SWIGTYPE_p_wxTipWindow swig_types[160]
+#define SWIGTYPE_p_wxToolBar swig_types[161]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[162]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[163]
+#define SWIGTYPE_p_wxValidator swig_types[164]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[165]
+#define SWIGTYPE_p_wxWindow swig_types[166]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[167]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168]
+#define SWIGTYPE_p_wxXPMHandler swig_types[169]
+static swig_type_info *swig_types[171];
+static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -2823,6 +2828,9 @@ SWIG_AsVal_double (PyObject *obj, double* val)
 SWIGINTERN void wxTopLevelWindow_MacSetMetalAppearance(wxTopLevelWindow *self,bool on){ /*wxPyRaiseNotImplemented();*/ }
 SWIGINTERN bool wxTopLevelWindow_MacGetMetalAppearance(wxTopLevelWindow const *self){ /*wxPyRaiseNotImplemented();*/ return false; }
 
 SWIGINTERN void wxTopLevelWindow_MacSetMetalAppearance(wxTopLevelWindow *self,bool on){ /*wxPyRaiseNotImplemented();*/ }
 SWIGINTERN bool wxTopLevelWindow_MacGetMetalAppearance(wxTopLevelWindow const *self){ /*wxPyRaiseNotImplemented();*/ return false; }
 

+#define wxDEFAULT_MINIFRAME_STYLE wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION_HORIZ
+
+

 
 SWIGINTERN wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){
             wxRect r;
 
 SWIGINTERN wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){
             wxRect r;


@@ -3146,6 +3154,10 @@ void wxPyHtmlListBox::OnLinkClicked(size_t n,
  
 
 
  
 
 

+    const wxArrayString wxPyEmptyStringArray;
+
+ static const wxString wxPySimpleHtmlListBoxNameStr(wxSimpleHtmlListBoxNameStr); 
+

 
 
 #ifndef wxHAS_TASK_BAR_ICON
 
 
 #ifndef wxHAS_TASK_BAR_ICON


@@ -3273,7 +3285,6 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxWindow(parent, id, pos, size, style, name) {}
 
                const wxString& name = wxPyPanelNameStr)
         : wxWindow(parent, id, pos, size, style, name) {}
 

-    void SetBestSize(const wxSize& size) { wxWindow::SetBestSize(size); }

 
     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__
 
     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__


@@ -3365,7 +3376,6 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxPanel(parent, id, pos, size, style, name) {}
 
                const wxString& name = wxPyPanelNameStr)
         : wxPanel(parent, id, pos, size, style, name) {}
 

-    void SetBestSize(const wxSize& size) { wxPanel::SetBestSize(size); }

     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__
         return wxWindow::DoEraseBackground(dc->GetHDC());
     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__
         return wxWindow::DoEraseBackground(dc->GetHDC());


@@ -3457,7 +3467,6 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxScrolledWindow(parent, id, pos, size, style, name) {}
 
                const wxString& name = wxPyPanelNameStr)
         : wxScrolledWindow(parent, id, pos, size, style, name) {}
 

-    void SetBestSize(const wxSize& size) { wxScrolledWindow::SetBestSize(size); }

     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__
         return wxWindow::DoEraseBackground(dc->GetHDC());
     bool DoEraseBackground(wxDC* dc) {
 #ifdef __WXMSW__
         return wxWindow::DoEraseBackground(dc->GetHDC());


@@ -5824,6 +5833,47 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_TopLevelWindow_EnableCloseButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
+  bool arg2 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "enable", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TopLevelWindow_EnableCloseButton",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTopLevelWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TopLevelWindow_EnableCloseButton" "', expected argument " "1"" of type '" "wxTopLevelWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxTopLevelWindow * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TopLevelWindow_EnableCloseButton" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->EnableCloseButton(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TopLevelWindow_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_TopLevelWindow_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;


@@ -6046,49 +6096,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_TopLevelWindow_EnableCloseButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
-  bool arg2 = (bool) true ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "enable", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TopLevelWindow_EnableCloseButton",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxTopLevelWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TopLevelWindow_EnableCloseButton" "', expected argument " "1"" of type '" "wxTopLevelWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxTopLevelWindow * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_bool(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "TopLevelWindow_EnableCloseButton" "', expected argument " "2"" of type '" "bool""'");
-    } 
-    arg2 = static_cast< bool >(val2);
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->EnableCloseButton(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_TopLevelWindow_GetDefaultItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_TopLevelWindow_GetDefaultItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;


@@ -7811,57 +7818,76 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Dialog__CreateButtonSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxDialog *arg1 = (wxDialog *) 0 ;
   long arg2 ;
   PyObject *resultobj = 0;
   wxDialog *arg1 = (wxDialog *) 0 ;
   long arg2 ;

-  bool arg3 = (bool) false ;
-  int arg4 = (int) 0 ;

   wxSizer *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   long val2 ;
   int ecode2 = 0 ;
   wxSizer *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   long val2 ;
   int ecode2 = 0 ;

-  bool val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "flags",(char *) "separated",(char *) "distance", NULL 
+    (char *) "self",(char *) "flags", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Dialog_CreateButtonSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog__CreateButtonSizer",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDialog, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDialog, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Dialog_CreateButtonSizer" "', expected argument " "1"" of type '" "wxDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Dialog__CreateButtonSizer" "', expected argument " "1"" of type '" "wxDialog *""'"); 

   }
   arg1 = reinterpret_cast< wxDialog * >(argp1);
   ecode2 = SWIG_AsVal_long(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxDialog * >(argp1);
   ecode2 = SWIG_AsVal_long(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Dialog_CreateButtonSizer" "', expected argument " "2"" of type '" "long""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Dialog__CreateButtonSizer" "', expected argument " "2"" of type '" "long""'");

   } 
   arg2 = static_cast< long >(val2);
   } 
   arg2 = static_cast< long >(val2);

-  if (obj2) {
-    ecode3 = SWIG_AsVal_bool(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Dialog_CreateButtonSizer" "', expected argument " "3"" of type '" "bool""'");
-    } 
-    arg3 = static_cast< bool >(val3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizer *)(arg1)->CreateButtonSizer(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Dialog_CreateButtonSizer" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Dialog_CreateSeparatedButtonSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxDialog *arg1 = (wxDialog *) 0 ;
+  long arg2 ;
+  wxSizer *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_CreateSeparatedButtonSizer",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDialog, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Dialog_CreateSeparatedButtonSizer" "', expected argument " "1"" of type '" "wxDialog *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxDialog * >(argp1);
+  ecode2 = SWIG_AsVal_long(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Dialog_CreateSeparatedButtonSizer" "', expected argument " "2"" of type '" "long""'");
+  } 
+  arg2 = static_cast< long >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxSizer *)(arg1)->CreateButtonSizer(arg2,arg3,arg4);
+    result = (wxSizer *)(arg1)->CreateSeparatedButtonSizer(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -8063,7 +8089,7 @@ SWIGINTERN PyObject *_wrap_new_MiniFrame(PyObject *SWIGUNUSEDPARM(self), PyObjec
   wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
   wxSize const &arg5_defvalue = wxDefaultSize ;
   wxSize *arg5 = (wxSize *) &arg5_defvalue ;
   wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
   wxSize const &arg5_defvalue = wxDefaultSize ;
   wxSize *arg5 = (wxSize *) &arg5_defvalue ;

-  long arg6 = (long) wxDEFAULT_FRAME_STYLE ;
+  long arg6 = (long) wxDEFAULT_MINIFRAME_STYLE ;

   wxString const &arg7_defvalue = wxPyFrameNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxMiniFrame *result = 0 ;
   wxString const &arg7_defvalue = wxPyFrameNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxMiniFrame *result = 0 ;


@@ -8194,7 +8220,7 @@ SWIGINTERN PyObject *_wrap_MiniFrame_Create(PyObject *SWIGUNUSEDPARM(self), PyOb
   wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
   wxSize const &arg6_defvalue = wxDefaultSize ;
   wxSize *arg6 = (wxSize *) &arg6_defvalue ;
   wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
   wxSize const &arg6_defvalue = wxDefaultSize ;
   wxSize *arg6 = (wxSize *) &arg6_defvalue ;

-  long arg7 = (long) wxDEFAULT_FRAME_STYLE ;
+  long arg7 = (long) wxDEFAULT_MINIFRAME_STYLE ;

   wxString const &arg8_defvalue = wxPyFrameNameStr ;
   wxString *arg8 = (wxString *) &arg8_defvalue ;
   bool result;
   wxString const &arg8_defvalue = wxPyFrameNameStr ;
   wxString *arg8 = (wxString *) &arg8_defvalue ;
   bool result;


@@ -11142,94 +11168,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_SashWindow_SetSashBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxSashWindow *arg1 = (wxSashWindow *) 0 ;
-  wxSashEdgePosition arg2 ;
-  bool arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  bool val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "edge",(char *) "border", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSashWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SashWindow_SetSashBorder" "', expected argument " "1"" of type '" "wxSashWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxSashWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SashWindow_SetSashBorder" "', expected argument " "2"" of type '" "wxSashEdgePosition""'");
-  } 
-  arg2 = static_cast< wxSashEdgePosition >(val2);
-  ecode3 = SWIG_AsVal_bool(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SashWindow_SetSashBorder" "', expected argument " "3"" of type '" "bool""'");
-  } 
-  arg3 = static_cast< bool >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetSashBorder(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SashWindow_HasBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxSashWindow *arg1 = (wxSashWindow *) 0 ;
-  wxSashEdgePosition arg2 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "edge", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSashWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SashWindow_HasBorder" "', expected argument " "1"" of type '" "wxSashWindow const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxSashWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SashWindow_HasBorder" "', expected argument " "2"" of type '" "wxSashEdgePosition""'");
-  } 
-  arg2 = static_cast< wxSashEdgePosition >(val2);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxSashWindow const *)arg1)->HasBorder(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSashWindow *arg1 = (wxSashWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSashWindow *arg1 = (wxSashWindow *) 0 ;


@@ -15471,6 +15409,33 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_VListBox_RefreshSelected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyVListBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VListBox_RefreshSelected" "', expected argument " "1"" of type '" "wxPyVListBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyVListBox * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->RefreshSelected();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_VListBox_OnDrawSeparator(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
 SWIGINTERN PyObject *_wrap_VListBox_OnDrawSeparator(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;


@@ -15974,189 +15939,523 @@ SWIGINTERN PyObject *HtmlListBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObje
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_TaskBarIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyTaskBarIcon *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_TaskBarIcon",0,0,0)) SWIG_fail;
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxPyTaskBarIcon *)new wxPyTaskBarIcon();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
+SWIGINTERN int SimpleHtmlListBoxNameStr_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable SimpleHtmlListBoxNameStr is read-only.");
+  return 1;

 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_TaskBarIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+SWIGINTERN PyObject *SimpleHtmlListBoxNameStr_get(void) {
+  PyObject *pyobj = 0;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TaskBarIcon" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    delete arg1;
-    
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+#if wxUSE_UNICODE
+    pyobj = PyUnicode_FromWideChar((&wxPySimpleHtmlListBoxNameStr)->c_str(), (&wxPySimpleHtmlListBoxNameStr)->Len());
+#else
+    pyobj = PyString_FromStringAndSize((&wxPySimpleHtmlListBoxNameStr)->c_str(), (&wxPySimpleHtmlListBoxNameStr)->Len());
+#endif

   }
   }

-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
+  return pyobj;

 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_SimpleHtmlListBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
-  int arg4 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  int arg2 = (int) -1 ;
+  wxPoint const &arg3_defvalue = wxDefaultPosition ;
+  wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
+  wxSize const &arg4_defvalue = wxDefaultSize ;
+  wxSize *arg4 = (wxSize *) &arg4_defvalue ;
+  wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ;
+  wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ;
+  long arg6 = (long) wxHLB_DEFAULT_STYLE ;
+  wxValidator const &arg7_defvalue = wxDefaultValidator ;
+  wxValidator *arg7 = (wxValidator *) &arg7_defvalue ;
+  wxString const &arg8_defvalue = wxPySimpleHtmlListBoxNameStr ;
+  wxString *arg8 = (wxString *) &arg8_defvalue ;
+  wxSimpleHtmlListBox *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val4 ;
-  int ecode4 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  wxPoint temp3 ;
+  wxSize temp4 ;
+  bool temp5 = false ;
+  long val6 ;
+  int ecode6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  bool temp8 = false ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;

+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
+    (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOOO:new_SimpleHtmlListBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SimpleHtmlListBox" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SimpleHtmlListBox" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    {
+      arg3 = &temp3;
+      if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+    }
+  }
+  if (obj3) {
+    {
+      arg4 = &temp4;
+      if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail;
+    }
+  }
+  if (obj4) {
+    {
+      if (! PySequence_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
+        SWIG_fail;
+      }
+      arg5 = new wxArrayString;
+      temp5 = true;
+      int i, len=PySequence_Length(obj4);
+      for (i=0; i<len; i++) {
+        PyObject* item = PySequence_GetItem(obj4, i);
+        wxString* s = wxString_in_helper(item);
+        if (PyErr_Occurred())  SWIG_fail;
+        arg5->Add(*s);
+        delete s;
+        Py_DECREF(item);
+      }
+    }
+  }
+  if (obj5) {
+    ecode6 = SWIG_AsVal_long(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_SimpleHtmlListBox" "', expected argument " "6"" of type '" "long""'");
+    } 
+    arg6 = static_cast< long >(val6);
+  }
+  if (obj6) {
+    res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxValidator,  0  | 0);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "new_SimpleHtmlListBox" "', expected argument " "7"" of type '" "wxValidator const &""'"); 
+    }
+    if (!argp7) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SimpleHtmlListBox" "', expected argument " "7"" of type '" "wxValidator const &""'"); 
+    }
+    arg7 = reinterpret_cast< wxValidator * >(argp7);
+  }
+  if (obj7) {
+    {
+      arg8 = wxString_in_helper(obj7);
+      if (arg8 == NULL) SWIG_fail;
+      temp8 = true;
+    }

   }
   }

-  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
-  arg2 = obj1;
-  arg3 = obj2;
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
+    result = (wxSimpleHtmlListBox *)new wxSimpleHtmlListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSimpleHtmlListBox, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp5) delete arg5;
+  }
+  {
+    if (temp8)
+    delete arg8;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp5) delete arg5;
+  }
+  {
+    if (temp8)
+    delete arg8;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_TaskBarIcon_Destroy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PreSimpleHtmlListBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxSimpleHtmlListBox *result = 0 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_Destroy" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_PreSimpleHtmlListBox",0,0,0)) SWIG_fail;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxPyTaskBarIcon_Destroy(arg1);
+    result = (wxSimpleHtmlListBox *)new wxSimpleHtmlListBox();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSimpleHtmlListBox, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_TaskBarIcon_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimpleHtmlListBox_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  wxSimpleHtmlListBox *arg1 = (wxSimpleHtmlListBox *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  int arg3 = (int) -1 ;
+  wxPoint const &arg4_defvalue = wxDefaultPosition ;
+  wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
+  wxSize const &arg5_defvalue = wxDefaultSize ;
+  wxSize *arg5 = (wxSize *) &arg5_defvalue ;
+  wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ;
+  wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ;
+  long arg7 = (long) wxHLB_DEFAULT_STYLE ;
+  wxValidator const &arg8_defvalue = wxDefaultValidator ;
+  wxValidator *arg8 = (wxValidator *) &arg8_defvalue ;
+  wxString const &arg9_defvalue = wxPySimpleHtmlListBoxNameStr ;
+  wxString *arg9 = (wxString *) &arg9_defvalue ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  wxPoint temp4 ;
+  wxSize temp5 ;
+  bool temp6 = false ;
+  long val7 ;
+  int ecode7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  bool temp9 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "choices",(char *) "style",(char *) "validator",(char *) "name", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOOO:SimpleHtmlListBox_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSimpleHtmlListBox, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_IsOk" "', expected argument " "1"" of type '" "wxPyTaskBarIcon const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimpleHtmlListBox_Create" "', expected argument " "1"" of type '" "wxSimpleHtmlListBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSimpleHtmlListBox * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SimpleHtmlListBox_Create" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimpleHtmlListBox_Create" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  if (obj3) {
+    {
+      arg4 = &temp4;
+      if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail;
+    }
+  }
+  if (obj4) {
+    {
+      arg5 = &temp5;
+      if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail;
+    }
+  }
+  if (obj5) {
+    {
+      if (! PySequence_Check(obj5)) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
+        SWIG_fail;
+      }
+      arg6 = new wxArrayString;
+      temp6 = true;
+      int i, len=PySequence_Length(obj5);
+      for (i=0; i<len; i++) {
+        PyObject* item = PySequence_GetItem(obj5, i);
+        wxString* s = wxString_in_helper(item);
+        if (PyErr_Occurred())  SWIG_fail;
+        arg6->Add(*s);
+        delete s;
+        Py_DECREF(item);
+      }
+    }
+  }
+  if (obj6) {
+    ecode7 = SWIG_AsVal_long(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "SimpleHtmlListBox_Create" "', expected argument " "7"" of type '" "long""'");
+    } 
+    arg7 = static_cast< long >(val7);
+  }
+  if (obj7) {
+    res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_wxValidator,  0  | 0);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "SimpleHtmlListBox_Create" "', expected argument " "8"" of type '" "wxValidator const &""'"); 
+    }
+    if (!argp8) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SimpleHtmlListBox_Create" "', expected argument " "8"" of type '" "wxValidator const &""'"); 
+    }
+    arg8 = reinterpret_cast< wxValidator * >(argp8);
+  }
+  if (obj8) {
+    {
+      arg9 = wxString_in_helper(obj8);
+      if (arg9 == NULL) SWIG_fail;
+      temp9 = true;
+    }

   }
   }

-  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPyTaskBarIcon const *)arg1)->IsOk();
+    result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
   }

+  {
+    if (temp6) delete arg6;
+  }
+  {
+    if (temp9)
+    delete arg9;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp6) delete arg6;
+  }
+  {
+    if (temp9)
+    delete arg9;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *SimpleHtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxSimpleHtmlListBox, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *SimpleHtmlListBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_TaskBarIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxPyTaskBarIcon *result = 0 ;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_IsIconInstalled" "', expected argument " "1"" of type '" "wxPyTaskBarIcon const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"new_TaskBarIcon",0,0,0)) SWIG_fail;

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPyTaskBarIcon const *)arg1)->IsIconInstalled();
+    result = (wxPyTaskBarIcon *)new wxPyTaskBarIcon();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_TaskBarIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
   PyObject *resultobj = 0;
   wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;

-  wxIcon *arg2 = 0 ;
-  wxString const &arg3_defvalue = wxPyEmptyString ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TaskBarIcon" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  int arg4 = (int) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TaskBarIcon_Destroy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_Destroy" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxPyTaskBarIcon_Destroy(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TaskBarIcon_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_IsOk" "', expected argument " "1"" of type '" "wxPyTaskBarIcon const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxPyTaskBarIcon const *)arg1)->IsOk();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TaskBarIcon_IsIconInstalled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon_IsIconInstalled" "', expected argument " "1"" of type '" "wxPyTaskBarIcon const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxPyTaskBarIcon const *)arg1)->IsIconInstalled();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
+  wxIcon *arg2 = 0 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;

   wxString *arg3 = (wxString *) &arg3_defvalue ;
   bool result;
   void *argp1 = 0 ;
   wxString *arg3 = (wxString *) &arg3_defvalue ;
   bool result;
   void *argp1 = 0 ;


@@ -17959,6 +18258,10 @@ SWIGINTERN PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *SWIGUNUSEDP
     for (i=0; i<len; i++) {
       PyObject* item = PySequence_GetItem(obj1, i);
       PyObject* number  = PyNumber_Int(item);
     for (i=0; i<len; i++) {
       PyObject* item = PySequence_GetItem(obj1, i);
       PyObject* number  = PyNumber_Int(item);

+      if (!number) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
+        SWIG_fail;
+      }       

       arg2->Add(PyInt_AS_LONG(number));
       Py_DECREF(item);
       Py_DECREF(number);
       arg2->Add(PyInt_AS_LONG(number));
       Py_DECREF(item);
       Py_DECREF(number);


@@ -19634,6 +19937,67 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_ProgressDialog_Pulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxProgressDialog *arg1 = (wxProgressDialog *) 0 ;
+  wxString const &arg2_defvalue = wxPyEmptyString ;
+  wxString *arg2 = (wxString *) &arg2_defvalue ;
+  bool *arg3 = (bool *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  bool temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "newmsg", NULL 
+  };
+  
+  arg3 = &temp3;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_Pulse",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxProgressDialog, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_Pulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); 
+  }
+  arg1 = reinterpret_cast< wxProgressDialog * >(argp1);
+  if (obj1) {
+    {
+      arg2 = wxString_in_helper(obj1);
+      if (arg2 == NULL) SWIG_fail;
+      temp2 = true;
+    }
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Pulse((wxString const &)*arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_bool((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_bool, new_flags));
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_ProgressDialog_Resume(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxProgressDialog *arg1 = (wxProgressDialog *) 0 ;
 SWIGINTERN PyObject *_wrap_ProgressDialog_Resume(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxProgressDialog *arg1 = (wxProgressDialog *) 0 ;


@@ -20944,36 +21308,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-  wxWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIParentFrame_GetToolBar" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxWindow *)(arg1)->GetToolBar();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, 0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_MDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
 SWIGINTERN PyObject *_wrap_MDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;


@@ -21378,135 +21712,820 @@ SWIGINTERN PyObject *MDIChildFrame_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *MDIChildFrame_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
+SWIGINTERN PyObject *MDIChildFrame_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_MDIClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
+  long arg2 = (long) 0 ;
+  wxMDIClientWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "parent",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_MDIClientWindow",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MDIClientWindow" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
+  }
+  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_long(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MDIClientWindow" "', expected argument " "2"" of type '" "long""'");
+    } 
+    arg2 = static_cast< long >(val2);
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxMDIClientWindow *)new wxMDIClientWindow(arg1,arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMDIClientWindow, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_PreMDIClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxMDIClientWindow *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PreMDIClientWindow",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxMDIClientWindow *)new wxMDIClientWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMDIClientWindow, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MDIClientWindow_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxMDIClientWindow *arg1 = (wxMDIClientWindow *) 0 ;
+  wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
+  long arg3 = (long) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  long val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "parent",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MDIClientWindow_Create",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMDIClientWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIClientWindow_Create" "', expected argument " "1"" of type '" "wxMDIClientWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxMDIClientWindow * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MDIClientWindow_Create" "', expected argument " "2"" of type '" "wxMDIParentFrame *""'"); 
+  }
+  arg2 = reinterpret_cast< wxMDIParentFrame * >(argp2);
+  if (obj2) {
+    ecode3 = SWIG_AsVal_long(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MDIClientWindow_Create" "', expected argument " "3"" of type '" "long""'");
+    } 
+    arg3 = static_cast< long >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Create(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *MDIClientWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxMDIClientWindow, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *MDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  int arg2 = (int) (int)-1 ;
+  wxPoint const &arg3_defvalue = wxDefaultPosition ;
+  wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
+  wxSize const &arg4_defvalue = wxDefaultSize ;
+  wxSize *arg4 = (wxSize *) &arg4_defvalue ;
+  long arg5 = (long) 0 ;
+  wxString const &arg6_defvalue = wxPyPanelNameStr ;
+  wxString *arg6 = (wxString *) &arg6_defvalue ;
+  wxPyWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  wxPoint temp3 ;
+  wxSize temp4 ;
+  long val5 ;
+  int ecode5 = 0 ;
+  bool temp6 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  char *  kwnames[] = {
+    (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyWindow" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyWindow" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    {
+      arg3 = &temp3;
+      if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+    }
+  }
+  if (obj3) {
+    {
+      arg4 = &temp4;
+      if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail;
+    }
+  }
+  if (obj4) {
+    ecode5 = SWIG_AsVal_long(obj4, &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyWindow" "', expected argument " "5"" of type '" "long""'");
+    } 
+    arg5 = static_cast< long >(val5);
+  }
+  if (obj5) {
+    {
+      arg6 = wxString_in_helper(obj5);
+      if (arg6 == NULL) SWIG_fail;
+      temp6 = true;
+    }
+  }
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyWindow *)new wxPyWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyWindow, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp6)
+    delete arg6;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp6)
+    delete arg6;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_PrePyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyWindow *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PrePyWindow",0,0,0)) SWIG_fail;
+  {
+    if (!wxPyCheckForApp()) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyWindow *)new wxPyWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyWindow, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "dc", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyWindow_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 
+  }
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->DoEraseBackground(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  int arg6 = (int) wxSIZE_AUTO ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetSize" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyWindow_DoSetSize" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyWindow_DoSetSize" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  if (obj5) {
+    ecode6 = SWIG_AsVal_int(obj5, &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyWindow_DoSetSize" "', expected argument " "6"" of type '" "int""'");
+    } 
+    arg6 = static_cast< int >(val6);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "width",(char *) "height", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DoSetClientSize(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DoSetVirtualSize(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int temp2 ;
+  int res2 = SWIG_TMPOBJ ;
+  int temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  PyObject *swig_obj[1] ;
+  
+  arg2 = &temp2;
+  arg3 = &temp3;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    ((wxPyWindow const *)arg1)->DoGetSize(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsTmpObj(res2)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int temp2 ;
+  int res2 = SWIG_TMPOBJ ;
+  int temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  PyObject *swig_obj[1] ;
+  
+  arg2 = &temp2;
+  arg3 = &temp3;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    ((wxPyWindow const *)arg1)->DoGetClientSize(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsTmpObj(res2)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  int *arg2 = (int *) 0 ;
+  int *arg3 = (int *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int temp2 ;
+  int res2 = SWIG_TMPOBJ ;
+  int temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  PyObject *swig_obj[1] ;
+  
+  arg2 = &temp2;
+  arg3 = &temp3;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetPosition" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    ((wxPyWindow const *)arg1)->DoGetPosition(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsTmpObj(res2)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyWindow_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxSize result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxPyWindow const *)arg1)->DoGetVirtualSize();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+

 
 

-SWIGINTERN PyObject *_wrap_new_MDIClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyWindow_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-  long arg2 = (long) 0 ;
-  wxMDIClientWindow *result = 0 ;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  long val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "parent",(char *) "style", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_MDIClientWindow",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MDIClientWindow" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_long(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_MDIClientWindow" "', expected argument " "2"" of type '" "long""'");
-    } 
-    arg2 = static_cast< long >(val2);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMDIClientWindow *)new wxMDIClientWindow(arg1,arg2);
+    result = ((wxPyWindow const *)arg1)->DoGetBestSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMDIClientWindow, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PreMDIClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyWindow_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMDIClientWindow *result = 0 ;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  SwigValueWrapper<wxVisualAttributes > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_PreMDIClientWindow",0,0,0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxMDIClientWindow *)new wxMDIClientWindow();
+    result = (arg1)->GetDefaultAttributes();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMDIClientWindow, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new wxVisualAttributes(static_cast< const wxVisualAttributes& >(result))), SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_MDIClientWindow_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyWindow_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxMDIClientWindow *arg1 = (wxMDIClientWindow *) 0 ;
-  wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
-  long arg3 = (long) 0 ;
-  bool result;
+  wxPyWindow *arg1 = (wxPyWindow *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  long val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "parent",(char *) "style", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:MDIClientWindow_Create",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMDIClientWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIClientWindow_Create" "', expected argument " "1"" of type '" "wxMDIClientWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIClientWindow * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MDIClientWindow_Create" "', expected argument " "2"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg2 = reinterpret_cast< wxMDIParentFrame * >(argp2);
-  if (obj2) {
-    ecode3 = SWIG_AsVal_long(obj2, &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "MDIClientWindow_Create" "', expected argument " "3"" of type '" "long""'");
-    } 
-    arg3 = static_cast< long >(val3);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPyWindow * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Create(arg2,arg3);
+    (arg1)->OnInternalIdle();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *MDIClientWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxMDIClientWindow, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyWindow, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *MDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
   int arg2 = (int) (int)-1 ;
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
   int arg2 = (int) (int)-1 ;


@@ -21517,7 +22536,7 @@ SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject
   long arg5 = (long) 0 ;
   wxString const &arg6_defvalue = wxPyPanelNameStr ;
   wxString *arg6 = (wxString *) &arg6_defvalue ;
   long arg5 = (long) 0 ;
   wxString const &arg6_defvalue = wxPyPanelNameStr ;
   wxString *arg6 = (wxString *) &arg6_defvalue ;

-  wxPyWindow *result = 0 ;
+  wxPyPanel *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;


@@ -21537,16 +22556,16 @@ SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject
     (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
   };
   
     (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyPanel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyWindow" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPanel" "', expected argument " "1"" of type '" "wxWindow *""'"); 

   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_int(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_int(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyWindow" "', expected argument " "2"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyPanel" "', expected argument " "2"" of type '" "int""'");

     } 
     arg2 = static_cast< int >(val2);
   }
     } 
     arg2 = static_cast< int >(val2);
   }


@@ -21565,7 +22584,7 @@ SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (obj4) {
     ecode5 = SWIG_AsVal_long(obj4, &val5);
     if (!SWIG_IsOK(ecode5)) {
   if (obj4) {
     ecode5 = SWIG_AsVal_long(obj4, &val5);
     if (!SWIG_IsOK(ecode5)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyWindow" "', expected argument " "5"" of type '" "long""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyPanel" "', expected argument " "5"" of type '" "long""'");

     } 
     arg5 = static_cast< long >(val5);
   }
     } 
     arg5 = static_cast< long >(val5);
   }


@@ -21579,11 +22598,11 @@ SWIGINTERN PyObject *_wrap_new_PyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyWindow *)new wxPyWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
+    result = (wxPyPanel *)new wxPyPanel(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyWindow, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPanel, SWIG_POINTER_NEW |  0 );

   {
     if (temp6)
     delete arg6;
   {
     if (temp6)
     delete arg6;


@@ -21598,28 +22617,28 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrePyWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PrePyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *result = 0 ;
+  wxPyPanel *result = 0 ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_PrePyWindow",0,0,0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args,"new_PrePyPanel",0,0,0)) SWIG_fail;

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyWindow *)new wxPyWindow();
+    result = (wxPyPanel *)new wxPyPanel();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyWindow, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPanel, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;
   void *argp1 = 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;
   void *argp1 = 0 ;


@@ -21631,12 +22650,12 @@ SWIGINTERN PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *SWIGUNUSEDPARM(se
     (char *) "self",(char *) "self",(char *) "_class", NULL 
   };
   
     (char *) "self",(char *) "self",(char *) "_class", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   arg2 = obj1;
   arg3 = obj2;
   {
   arg2 = obj1;
   arg3 = obj2;
   {


@@ -21652,45 +22671,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_SetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
-  wxSize *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_SetBestSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_SetBestSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetBestSize((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PyWindow_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   wxDC *arg2 = (wxDC *) 0 ;
   bool result;
   void *argp1 = 0 ;
   wxDC *arg2 = (wxDC *) 0 ;
   bool result;
   void *argp1 = 0 ;


@@ -21703,15 +22686,15 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoEraseBackground(PyObject *SWIGUNUSEDPARM(s
     (char *) "self",(char *) "dc", NULL 
   };
   
     (char *) "self",(char *) "dc", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyWindow_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyPanel_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   arg2 = reinterpret_cast< wxDC * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxDC * >(argp2);
   {


@@ -21729,9 +22712,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int arg2 ;
   int arg3 ;
   int arg4 ;
   int arg2 ;
   int arg3 ;
   int arg4 ;


@@ -21755,30 +22738,30 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self),
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");

   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyWindow_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");

   } 
   arg5 = static_cast< int >(val5);
   {
   } 
   arg5 = static_cast< int >(val5);
   {


@@ -21794,9 +22777,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int arg2 ;
   int arg3 ;
   int arg4 ;
   int arg2 ;
   int arg3 ;
   int arg4 ;


@@ -21824,36 +22807,36 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoSetSize(PyObject *SWIGUNUSEDPARM(self), Py
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyWindow_DoSetSize" "', expected argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyPanel_DoSetSize" "', expected argument " "4"" of type '" "int""'");

   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyWindow_DoSetSize" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyPanel_DoSetSize" "', expected argument " "5"" of type '" "int""'");

   } 
   arg5 = static_cast< int >(val5);
   if (obj5) {
     ecode6 = SWIG_AsVal_int(obj5, &val6);
     if (!SWIG_IsOK(ecode6)) {
   } 
   arg5 = static_cast< int >(val5);
   if (obj5) {
     ecode6 = SWIG_AsVal_int(obj5, &val6);
     if (!SWIG_IsOK(ecode6)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyWindow_DoSetSize" "', expected argument " "6"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyPanel_DoSetSize" "', expected argument " "6"" of type '" "int""'");

     } 
     arg6 = static_cast< int >(val6);
   }
     } 
     arg6 = static_cast< int >(val6);
   }


@@ -21870,9 +22853,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;
   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;


@@ -21888,20 +22871,20 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoSetClientSize(PyObject *SWIGUNUSEDPARM(sel
     (char *) "self",(char *) "width",(char *) "height", NULL 
   };
   
     (char *) "self",(char *) "width",(char *) "height", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   {
   } 
   arg3 = static_cast< int >(val3);
   {


@@ -21917,9 +22900,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;
   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;


@@ -21935,20 +22918,20 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(se
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyWindow_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   {
   } 
   arg3 = static_cast< int >(val3);
   {


@@ -21964,9 +22947,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -21981,14 +22964,14 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoGetSize(PyObject *SWIGUNUSEDPARM(self), Py
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyWindow const *)arg1)->DoGetSize(arg2,arg3);
+    ((wxPyPanel const *)arg1)->DoGetSize(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22011,9 +22994,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -22028,14 +23011,14 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoGetClientSize(PyObject *SWIGUNUSEDPARM(sel
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyWindow const *)arg1)->DoGetClientSize(arg2,arg3);
+    ((wxPyPanel const *)arg1)->DoGetClientSize(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22058,9 +23041,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -22075,14 +23058,14 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoGetPosition(PyObject *SWIGUNUSEDPARM(self)
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetPosition" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetPosition" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyWindow const *)arg1)->DoGetPosition(arg2,arg3);
+    ((wxPyPanel const *)arg1)->DoGetPosition(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22105,9 +23088,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -22115,14 +23098,14 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(se
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPyWindow const *)arg1)->DoGetVirtualSize();
+    result = ((wxPyPanel const *)arg1)->DoGetVirtualSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22133,9 +23116,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -22143,14 +23126,14 @@ SWIGINTERN PyObject *_wrap_PyWindow_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self)
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPyWindow const *)arg1)->DoGetBestSize();
+    result = ((wxPyPanel const *)arg1)->DoGetBestSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22161,9 +23144,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   SwigValueWrapper<wxVisualAttributes > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper<wxVisualAttributes > result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -22171,11 +23154,11 @@ SWIGINTERN PyObject *_wrap_PyWindow_GetDefaultAttributes(PyObject *SWIGUNUSEDPAR
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     result = (arg1)->GetDefaultAttributes();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     result = (arg1)->GetDefaultAttributes();


@@ -22189,20 +23172,20 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyWindow_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyPanel_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyWindow *arg1 = (wxPyWindow *) 0 ;
+  wxPyPanel *arg1 = (wxPyPanel *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyWindow_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPyPanel * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->OnInternalIdle();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->OnInternalIdle();


@@ -22216,18 +23199,18 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *PyWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyPanel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyWindow, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyPanel, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *PyWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PyPanel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
   int arg2 = (int) (int)-1 ;
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
   int arg2 = (int) (int)-1 ;


@@ -22238,7 +23221,7 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject
   long arg5 = (long) 0 ;
   wxString const &arg6_defvalue = wxPyPanelNameStr ;
   wxString *arg6 = (wxString *) &arg6_defvalue ;
   long arg5 = (long) 0 ;
   wxString const &arg6_defvalue = wxPyPanelNameStr ;
   wxString *arg6 = (wxString *) &arg6_defvalue ;

-  wxPyPanel *result = 0 ;
+  wxPyScrolledWindow *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;


@@ -22258,16 +23241,16 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject
     (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
   };
   
     (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyPanel",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPanel" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyScrolledWindow" "', expected argument " "1"" of type '" "wxWindow *""'"); 

   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_int(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_int(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyPanel" "', expected argument " "2"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyScrolledWindow" "', expected argument " "2"" of type '" "int""'");

     } 
     arg2 = static_cast< int >(val2);
   }
     } 
     arg2 = static_cast< int >(val2);
   }


@@ -22286,7 +23269,7 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (obj4) {
     ecode5 = SWIG_AsVal_long(obj4, &val5);
     if (!SWIG_IsOK(ecode5)) {
   if (obj4) {
     ecode5 = SWIG_AsVal_long(obj4, &val5);
     if (!SWIG_IsOK(ecode5)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyPanel" "', expected argument " "5"" of type '" "long""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyScrolledWindow" "', expected argument " "5"" of type '" "long""'");

     } 
     arg5 = static_cast< long >(val5);
   }
     } 
     arg5 = static_cast< long >(val5);
   }


@@ -22300,11 +23283,11 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyPanel *)new wxPyPanel(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
+    result = (wxPyScrolledWindow *)new wxPyScrolledWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPanel, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_NEW |  0 );

   {
     if (temp6)
     delete arg6;
   {
     if (temp6)
     delete arg6;


@@ -22319,28 +23302,28 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrePyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PrePyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *result = 0 ;
+  wxPyScrolledWindow *result = 0 ;

   
   

-  if (!SWIG_Python_UnpackTuple(args,"new_PrePyPanel",0,0,0)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args,"new_PrePyScrolledWindow",0,0,0)) SWIG_fail;

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyPanel *)new wxPyPanel();
+    result = (wxPyScrolledWindow *)new wxPyScrolledWindow();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPanel, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;
   void *argp1 = 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
   PyObject *arg3 = (PyObject *) 0 ;
   void *argp1 = 0 ;


@@ -22352,12 +23335,12 @@ SWIGINTERN PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *SWIGUNUSEDPARM(sel
     (char *) "self",(char *) "self",(char *) "_class", NULL 
   };
   
     (char *) "self",(char *) "self",(char *) "_class", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   arg2 = obj1;
   arg3 = obj2;
   {
   arg2 = obj1;
   arg3 = obj2;
   {


@@ -22373,45 +23356,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_SetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
-  wxSize *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_SetBestSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_SetBestSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetBestSize((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PyPanel_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   wxDC *arg2 = (wxDC *) 0 ;
   bool result;
   void *argp1 = 0 ;
   wxDC *arg2 = (wxDC *) 0 ;
   bool result;
   void *argp1 = 0 ;


@@ -22424,15 +23371,15 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoEraseBackground(PyObject *SWIGUNUSEDPARM(se
     (char *) "self",(char *) "dc", NULL 
   };
   
     (char *) "self",(char *) "dc", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyPanel_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyScrolledWindow_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   arg2 = reinterpret_cast< wxDC * >(argp2);
   {
   }
   arg2 = reinterpret_cast< wxDC * >(argp2);
   {


@@ -22450,9 +23397,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int arg2 ;
   int arg3 ;
   int arg4 ;
   int arg2 ;
   int arg3 ;
   int arg4 ;


@@ -22476,30 +23423,30 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self),
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");

   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyPanel_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");

   } 
   arg5 = static_cast< int >(val5);
   {
   } 
   arg5 = static_cast< int >(val5);
   {


@@ -22515,9 +23462,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int arg2 ;
   int arg3 ;
   int arg4 ;
   int arg2 ;
   int arg3 ;
   int arg4 ;


@@ -22545,36 +23492,36 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyO
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
   } 
   arg3 = static_cast< int >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyPanel_DoSetSize" "', expected argument " "4"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "4"" of type '" "int""'");

   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
   } 
   arg4 = static_cast< int >(val4);
   ecode5 = SWIG_AsVal_int(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyPanel_DoSetSize" "', expected argument " "5"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "5"" of type '" "int""'");

   } 
   arg5 = static_cast< int >(val5);
   if (obj5) {
     ecode6 = SWIG_AsVal_int(obj5, &val6);
     if (!SWIG_IsOK(ecode6)) {
   } 
   arg5 = static_cast< int >(val5);
   if (obj5) {
     ecode6 = SWIG_AsVal_int(obj5, &val6);
     if (!SWIG_IsOK(ecode6)) {

-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyPanel_DoSetSize" "', expected argument " "6"" of type '" "int""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "6"" of type '" "int""'");

     } 
     arg6 = static_cast< int >(val6);
   }
     } 
     arg6 = static_cast< int >(val6);
   }


@@ -22591,9 +23538,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;
   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;


@@ -22609,20 +23556,20 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self
     (char *) "self",(char *) "width",(char *) "height", NULL 
   };
   
     (char *) "self",(char *) "width",(char *) "height", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   {
   } 
   arg3 = static_cast< int >(val3);
   {


@@ -22638,9 +23585,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;
   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;


@@ -22656,20 +23603,20 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(sel
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   
     (char *) "self",(char *) "x",(char *) "y", NULL 
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
   } 
   arg2 = static_cast< int >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyPanel_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");

   } 
   arg3 = static_cast< int >(val3);
   {
   } 
   arg3 = static_cast< int >(val3);
   {


@@ -22685,9 +23632,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -22702,14 +23649,14 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyPanel const *)arg1)->DoGetSize(arg2,arg3);
+    ((wxPyScrolledWindow const *)arg1)->DoGetSize(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22732,9 +23679,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -22749,14 +23696,14 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyPanel const *)arg1)->DoGetClientSize(arg2,arg3);
+    ((wxPyScrolledWindow const *)arg1)->DoGetClientSize(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22779,9 +23726,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
   void *argp1 = 0 ;


@@ -22796,14 +23743,14 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoGetPosition(PyObject *SWIGUNUSEDPARM(self),
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   arg3 = &temp3;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetPosition" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetPosition" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyPanel const *)arg1)->DoGetPosition(arg2,arg3);
+    ((wxPyScrolledWindow const *)arg1)->DoGetPosition(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -22826,37 +23773,9 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyPanel_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
-  wxSize result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxPyPanel const *)arg1)->DoGetVirtualSize();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PyPanel_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
+  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxSize result;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -22864,444 +23783,242 @@ SWIGINTERN PyObject *_wrap_PyPanel_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self),
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyPanel const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = ((wxPyPanel const *)arg1)->DoGetBestSize();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PyPanel_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
-  SwigValueWrapper<wxVisualAttributes > result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (arg1)->GetDefaultAttributes();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj((new wxVisualAttributes(static_cast< const wxVisualAttributes& >(result))), SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PyPanel_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyPanel *arg1 = (wxPyPanel *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPanel, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPanel_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyPanel *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyPanel * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->OnInternalIdle();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *PyPanel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyPanel, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PyPanel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxWindow *arg1 = (wxWindow *) 0 ;
-  int arg2 = (int) (int)-1 ;
-  wxPoint const &arg3_defvalue = wxDefaultPosition ;
-  wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
-  wxSize const &arg4_defvalue = wxDefaultSize ;
-  wxSize *arg4 = (wxSize *) &arg4_defvalue ;
-  long arg5 = (long) 0 ;
-  wxString const &arg6_defvalue = wxPyPanelNameStr ;
-  wxString *arg6 = (wxString *) &arg6_defvalue ;
-  wxPyScrolledWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  wxPoint temp3 ;
-  wxSize temp4 ;
-  long val5 ;
-  int ecode5 = 0 ;
-  bool temp6 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  char *  kwnames[] = {
-    (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_PyScrolledWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyScrolledWindow" "', expected argument " "1"" of type '" "wxWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  if (obj1) {
-    ecode2 = SWIG_AsVal_int(obj1, &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyScrolledWindow" "', expected argument " "2"" of type '" "int""'");
-    } 
-    arg2 = static_cast< int >(val2);
-  }
-  if (obj2) {
-    {
-      arg3 = &temp3;
-      if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
-    }
-  }
-  if (obj3) {
-    {
-      arg4 = &temp4;
-      if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail;
-    }
-  }
-  if (obj4) {
-    ecode5 = SWIG_AsVal_long(obj4, &val5);
-    if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_PyScrolledWindow" "', expected argument " "5"" of type '" "long""'");
-    } 
-    arg5 = static_cast< long >(val5);
-  }
-  if (obj5) {
-    {
-      arg6 = wxString_in_helper(obj5);
-      if (arg6 == NULL) SWIG_fail;
-      temp6 = true;
-    }
-  }
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxPyScrolledWindow *)new wxPyScrolledWindow(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_NEW |  0 );
-  {
-    if (temp6)
-    delete arg6;
-  }
-  return resultobj;
-fail:
-  {
-    if (temp6)
-    delete arg6;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 

   }
   }

-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_PrePyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyScrolledWindow *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_PrePyScrolledWindow",0,0,0)) SWIG_fail;
+  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyScrolledWindow *)new wxPyScrolledWindow();
+    result = ((wxPyScrolledWindow const *)arg1)->DoGetVirtualSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
+  wxSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "self",(char *) "_class", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 

   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

-  arg2 = obj1;
-  arg3 = obj2;

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->_setCallbackInfo(arg2,arg3);
+    result = ((wxPyScrolledWindow const *)arg1)->DoGetBestSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_SetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

-  wxSize *arg2 = 0 ;
+  SwigValueWrapper<wxVisualAttributes > result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_SetBestSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_SetBestSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetBestSize((wxSize const &)*arg2);
+    result = (arg1)->GetDefaultAttributes();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxVisualAttributes(static_cast< const wxVisualAttributes& >(result))), SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoEraseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PyScrolledWindow_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
   PyObject *resultobj = 0;
   wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;

-  wxDC *arg2 = (wxDC *) 0 ;
-  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "dc", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_DoEraseBackground",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoEraseBackground" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 

   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyScrolledWindow_DoEraseBackground" "', expected argument " "2"" of type '" "wxDC *""'"); 
-  }
-  arg2 = reinterpret_cast< wxDC * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->DoEraseBackground(arg2);
+    (arg1)->OnInternalIdle();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *PyScrolledWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyScrolledWindow, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PyScrolledWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN int PrintoutTitleStr_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable PrintoutTitleStr is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *PrintoutTitleStr_get(void) {
+  PyObject *pyobj = 0;
+  
+  {
+#if wxUSE_UNICODE
+    pyobj = PyUnicode_FromWideChar((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len());
+#else
+    pyobj = PyString_FromStringAndSize((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len());
+#endif
+  }
+  return pyobj;
+}
+
+
+SWIGINTERN int PreviewCanvasNameStr_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable PreviewCanvasNameStr is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *PreviewCanvasNameStr_get(void) {
+  PyObject *pyobj = 0;
+  

   {
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+#if wxUSE_UNICODE
+    pyobj = PyUnicode_FromWideChar((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len());
+#else
+    pyobj = PyString_FromStringAndSize((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len());
+#endif
+  }
+  return pyobj;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_PrintData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+  PyObject *resultobj = 0;
+  wxPrintData *result = 0 ;
+  
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPrintData *)new wxPrintData();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoMoveWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PrintData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
+  wxPrintData *arg1 = 0 ;
+  wxPrintData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyScrolledWindow_DoMoveWindow" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5);
+    result = (wxPrintData *)new wxPrintData((wxPrintData const &)*arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PrintData(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PrintData",0,1,argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_PrintData__SWIG_0(self, argc, argv);
+  }
+  if (argc == 1) {
+    return _wrap_new_PrintData__SWIG_1(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintData'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  int arg4 ;
-  int arg5 ;
-  int arg6 = (int) wxSIZE_AUTO ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
-  int val5 ;
-  int ecode5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL 
-  };
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
-  ecode5 = SWIG_AsVal_int(obj4, &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "5"" of type '" "int""'");
-  } 
-  arg5 = static_cast< int >(val5);
-  if (obj5) {
-    ecode6 = SWIG_AsVal_int(obj5, &val6);
-    if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "PyScrolledWindow_DoSetSize" "', expected argument " "6"" of type '" "int""'");
-    } 
-    arg6 = static_cast< int >(val6);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6);
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -23312,187 +24029,115 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_GetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int arg2 ;
-  int arg3 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "width",(char *) "height", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetNoCopies" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetClientSize" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DoSetClientSize(arg2,arg3);
+    result = (int)(arg1)->GetNoCopies();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoSetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_GetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int arg2 ;
-  int arg3 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetCollate" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PyScrolledWindow_DoSetVirtualSize" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->DoSetVirtualSize(arg2,arg3);
+    result = (bool)(arg1)->GetCollate();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int temp2 ;
-  int res2 = SWIG_TMPOBJ ;
-  int temp3 ;
-  int res3 = SWIG_TMPOBJ ;

   PyObject *swig_obj[1] ;
   
   PyObject *swig_obj[1] ;
   

-  arg2 = &temp2;
-  arg3 = &temp3;

   if (!args) SWIG_fail;
   swig_obj[0] = args;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetOrientation" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyScrolledWindow const *)arg1)->DoGetSize(arg2,arg3);
+    result = (int)(arg1)->GetOrientation();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
-  if (SWIG_IsTmpObj(res2)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res3)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetClientSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_IsOrientationReversed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int temp2 ;
-  int res2 = SWIG_TMPOBJ ;
-  int temp3 ;
-  int res3 = SWIG_TMPOBJ ;

   PyObject *swig_obj[1] ;
   
   PyObject *swig_obj[1] ;
   

-  arg2 = &temp2;
-  arg3 = &temp3;

   if (!args) SWIG_fail;
   swig_obj[0] = args;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetClientSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_IsOrientationReversed" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyScrolledWindow const *)arg1)->DoGetClientSize(arg2,arg3);
+    result = (bool)((wxPrintData const *)arg1)->IsOrientationReversed();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
-  if (SWIG_IsTmpObj(res2)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res3)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   return resultobj;
 fail:
   }
   return resultobj;
 fail:


@@ -23500,46 +24145,29 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  int *arg2 = (int *) 0 ;
-  int *arg3 = (int *) 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int temp2 ;
-  int res2 = SWIG_TMPOBJ ;
-  int temp3 ;
-  int res3 = SWIG_TMPOBJ ;

   PyObject *swig_obj[1] ;
   
   PyObject *swig_obj[1] ;
   

-  arg2 = &temp2;
-  arg3 = &temp3;

   if (!args) SWIG_fail;
   swig_obj[0] = args;
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetPosition" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_IsOk" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    ((wxPyScrolledWindow const *)arg1)->DoGetPosition(arg2,arg3);
+    result = (bool)(arg1)->IsOk();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
-  if (SWIG_IsTmpObj(res2)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
-  }
-  if (SWIG_IsTmpObj(res3)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   return resultobj;
 fail:
   }
   return resultobj;
 fail:


@@ -23547,266 +24175,220 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetVirtualSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetPrinterName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  wxSize result;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  wxString *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetVirtualSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrinterName" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPyScrolledWindow const *)arg1)->DoGetVirtualSize();
+    {
+      wxString const &_result_ref = (arg1)->GetPrinterName();
+      result = (wxString *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
+#else
+    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
+#endif
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_DoGetBestSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  wxSize result;
+SWIGINTERN PyObject *_wrap_PrintData_GetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_DoGetBestSize" "', expected argument " "1"" of type '" "wxPyScrolledWindow const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetColour" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPyScrolledWindow const *)arg1)->DoGetBestSize();
+    result = (bool)(arg1)->GetColour();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_GetDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetDuplex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
-  SwigValueWrapper<wxVisualAttributes > result;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  wxDuplexMode result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_GetDefaultAttributes" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetDuplex" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetDefaultAttributes();
+    result = (wxDuplexMode)(arg1)->GetDuplex();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxVisualAttributes(static_cast< const wxVisualAttributes& >(result))), SWIGTYPE_p_wxVisualAttributes, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PyScrolledWindow_OnInternalIdle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  wxPaperSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyScrolledWindow, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyScrolledWindow_OnInternalIdle" "', expected argument " "1"" of type '" "wxPyScrolledWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPaperId" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPyScrolledWindow * >(argp1);
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->OnInternalIdle();
+    result = (wxPaperSize)(arg1)->GetPaperId();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *PyScrolledWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPyScrolledWindow, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PyScrolledWindow_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN int PrintoutTitleStr_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable PrintoutTitleStr is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *PrintoutTitleStr_get(void) {
-  PyObject *pyobj = 0;
-  
-  {
-#if wxUSE_UNICODE
-    pyobj = PyUnicode_FromWideChar((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len());
-#else
-    pyobj = PyString_FromStringAndSize((&wxPyPrintoutTitleStr)->c_str(), (&wxPyPrintoutTitleStr)->Len());
-#endif
-  }
-  return pyobj;
-}
-
-
-SWIGINTERN int PreviewCanvasNameStr_set(PyObject *) {
-  SWIG_Error(SWIG_AttributeError,"Variable PreviewCanvasNameStr is read-only.");
-  return 1;
-}
-
-
-SWIGINTERN PyObject *PreviewCanvasNameStr_get(void) {
-  PyObject *pyobj = 0;
-  
-  {
-#if wxUSE_UNICODE
-    pyobj = PyUnicode_FromWideChar((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len());
-#else
-    pyobj = PyString_FromStringAndSize((&wxPyPreviewCanvasNameStr)->c_str(), (&wxPyPreviewCanvasNameStr)->Len());
-#endif
-  }
-  return pyobj;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_PrintData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_PrintData_GetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *result = 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  wxSize *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPaperSize" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintData *)new wxPrintData();
+    {
+      wxSize const &_result_ref = (arg1)->GetPaperSize();
+      result = (wxSize *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSize, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrintData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PrintData_GetQuality(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = 0 ;
-  wxPrintData *result = 0 ;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetQuality" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintData *)new wxPrintData((wxPrintData const &)*arg1);
+    result = (int)(arg1)->GetQuality();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrintData(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  
-  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PrintData",0,1,argv))) SWIG_fail;
-  --argc;
-  if (argc == 0) {
-    return _wrap_new_PrintData__SWIG_0(self, argc, argv);
-  }
-  if (argc == 1) {
-    return _wrap_new_PrintData__SWIG_1(self, argc, argv);
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintData'");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_PrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetBin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

+  wxPrintBin result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetBin" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    result = (wxPrintBin)(arg1)->GetBin();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetPrintMode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  int result;
+  wxPrintMode result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -23815,12 +24397,12 @@ SWIGINTERN PyObject *_wrap_PrintData_GetNoCopies(PyObject *SWIGUNUSEDPARM(self),
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetNoCopies" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrintMode" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)(arg1)->GetNoCopies();
+    result = (wxPrintMode)((wxPrintData const *)arg1)->GetPrintMode();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -23831,10 +24413,10 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_GetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  bool result;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -23843,324 +24425,411 @@ SWIGINTERN PyObject *_wrap_PrintData_GetCollate(PyObject *SWIGUNUSEDPARM(self),
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetCollate" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetMedia" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetCollate();
+    result = (int)((wxPrintData const *)arg1)->GetMedia();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  int result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetOrientation" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetNoCopies" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetNoCopies" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)(arg1)->GetOrientation();
+    (arg1)->SetNoCopies(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_Ok" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetCollate" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetCollate" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Ok();
+    (arg1)->SetCollate(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetPrinterName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxString *result = 0 ;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "orient", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrinterName" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetOrientation" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetOrientation" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxString const &_result_ref = (arg1)->GetPrinterName();
-      result = (wxString *) &_result_ref;
-    }
+    (arg1)->SetOrientation(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
-#else
-    resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
-#endif
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetOrientationReversed(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "reversed", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientationReversed",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetColour" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetOrientationReversed" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetOrientationReversed" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetColour();
+    (arg1)->SetOrientationReversed(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetDuplex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetPrinterName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxDuplexMode result;
+  wxString *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "name", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterName",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetDuplex" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrinterName" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxDuplexMode)(arg1)->GetDuplex();
+    (arg1)->SetPrinterName((wxString const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp2)
+    delete arg2;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxPaperSize result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "colour", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPaperId" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetColour" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetColour" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPaperSize)(arg1)->GetPaperId();
+    (arg1)->SetColour(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetDuplex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxSize *result = 0 ;
+  wxDuplexMode arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "duplex", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPaperSize" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetDuplex" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetDuplex" "', expected argument " "2"" of type '" "wxDuplexMode""'");
+  } 
+  arg2 = static_cast< wxDuplexMode >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxSize const &_result_ref = (arg1)->GetPaperSize();
-      result = (wxSize *) &_result_ref;
-    }
+    (arg1)->SetDuplex(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSize, 0 |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetQuality(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  int result;
+  wxPaperSize arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "sizeId", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetQuality" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPaperId" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetPaperId" "', expected argument " "2"" of type '" "wxPaperSize""'");
+  } 
+  arg2 = static_cast< wxPaperSize >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)(arg1)->GetQuality();
+    (arg1)->SetPaperId(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetBin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxPrintBin result;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "sz", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetBin" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPaperSize" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintBin)(arg1)->GetBin();
+    (arg1)->SetPaperSize((wxSize const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetPrintMode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintData_SetQuality(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxPrintMode result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "quality", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrintMode" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetQuality" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetQuality" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintMode)((wxPrintData const *)arg1)->GetPrintMode();
+    (arg1)->SetQuality(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_SetBin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  int arg2 ;
+  wxPrintBin arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;


@@ -24168,23 +24837,23 @@ SWIGINTERN PyObject *_wrap_PrintData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "v", NULL 
+    (char *) "self",(char *) "bin", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetBin",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetNoCopies" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetBin" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetNoCopies" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetBin" "', expected argument " "2"" of type '" "wxPrintBin""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< wxPrintBin >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetNoCopies(arg2);
+    (arg1)->SetBin(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24195,34 +24864,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_SetPrintMode(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  bool arg2 ;
+  wxPrintMode arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
+  int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "flag", NULL 
+    (char *) "self",(char *) "printMode", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetCollate" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrintMode" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetCollate" "', expected argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetPrintMode" "', expected argument " "2"" of type '" "wxPrintMode""'");

   } 
   } 

-  arg2 = static_cast< bool >(val2);
+  arg2 = static_cast< wxPrintMode >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetCollate(arg2);
+    (arg1)->SetPrintMode(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24233,7 +24902,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_SetMedia(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   int arg2 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   int arg2 ;


@@ -24244,23 +24913,23 @@ SWIGINTERN PyObject *_wrap_PrintData_SetOrientation(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "orient", NULL 
+    (char *) "self",(char *) "media", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetMedia",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetOrientation" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetMedia" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetOrientation" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetMedia" "', expected argument " "2"" of type '" "int""'");

   } 
   arg2 = static_cast< int >(val2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   } 
   arg2 = static_cast< int >(val2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetOrientation(arg2);
+    (arg1)->SetMedia(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24271,7 +24940,41 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetPrinterName(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintData *arg1 = (wxPrintData *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetFilename" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxPrintData const *)arg1)->GetFilename();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PrintData_SetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   wxString *arg2 = 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   wxString *arg2 = 0 ;


@@ -24281,13 +24984,13 @@ SWIGINTERN PyObject *_wrap_PrintData_SetPrinterName(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "name", NULL 
+    (char *) "self",(char *) "filename", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterName",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetFilename",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrinterName" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetFilename" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {


@@ -24297,7 +25000,7 @@ SWIGINTERN PyObject *_wrap_PrintData_SetPrinterName(PyObject *SWIGUNUSEDPARM(sel
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPrinterName((wxString const &)*arg2);
+    (arg1)->SetFilename((wxString const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24316,72 +25019,56 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_GetPrivData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  bool arg2 ;
+  PyObject *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "colour", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetColour" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrivData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetColour" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetColour(arg2);
+    result = (PyObject *)wxPrintData_GetPrivData(arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = result;

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetDuplex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintData_SetPrivData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintData *arg1 = (wxPrintData *) 0 ;

-  wxDuplexMode arg2 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "duplex", NULL 
+    (char *) "self",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrivData",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetDuplex" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrivData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetDuplex" "', expected argument " "2"" of type '" "wxDuplexMode""'");
-  } 
-  arg2 = static_cast< wxDuplexMode >(val2);
+  arg2 = obj1;

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetDuplex(arg2);
+    wxPrintData_SetPrivData(arg1,arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24392,70 +25079,141 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *PrintData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintData, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PrintData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxPaperSize arg2 ;
+  wxPageSetupDialogData *result = 0 ;
+  
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPageSetupDialogData *)new wxPageSetupDialogData();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  wxPageSetupDialogData *arg1 = 0 ;
+  wxPageSetupDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "sizeId", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPageSetupDialogData,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPaperId" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetPaperId" "', expected argument " "2"" of type '" "wxPaperSize""'");
-  } 
-  arg2 = static_cast< wxPaperSize >(val2);
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPaperId(arg2);
+    result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPageSetupDialogData const &)*arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxSize *arg2 = 0 ;
+  wxPrintData *arg1 = 0 ;
+  wxPageSetupDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "sz", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPaperSize" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 

   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {
   }
   arg1 = reinterpret_cast< wxPrintData * >(argp1);
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PageSetupDialogData",0,1,argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_PageSetupDialogData__SWIG_0(self, argc, argv);
+  }
+  if (argc == 1) {
+    int _v = 0;
+    {
+      int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxPageSetupDialogData, 0);
+      _v = SWIG_CheckState(res);
+    }
+    if (!_v) goto check_2;
+    return _wrap_new_PageSetupDialogData__SWIG_1(self, argc, argv);
+  }
+check_2:
+  
+  if (argc == 1) {
+    return _wrap_new_PageSetupDialogData__SWIG_2(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PageSetupDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPaperSize((wxSize const &)*arg2);
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24466,34 +25224,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetQuality(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  int arg2 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "quality", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetQuality" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableHelp" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetQuality" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableHelp" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetQuality(arg2);
+    (arg1)->EnableHelp(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24504,34 +25262,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetBin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxPrintBin arg2 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "bin", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetBin",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetBin" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetBin" "', expected argument " "2"" of type '" "wxPrintBin""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableMargins" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< wxPrintBin >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetBin(arg2);
+    (arg1)->EnableMargins(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24542,34 +25300,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetPrintMode(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxPrintMode arg2 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "printMode", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrintMode" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableOrientation" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintData_SetPrintMode" "', expected argument " "2"" of type '" "wxPrintMode""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableOrientation" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< wxPrintMode >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPrintMode(arg2);
+    (arg1)->EnableOrientation(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -24580,484 +25338,380 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxString result;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetFilename" "', expected argument " "1"" of type '" "wxPrintData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnablePaper" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnablePaper" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPrintData const *)arg1)->GetFilename();
+    (arg1)->EnablePaper(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetFilename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  wxString *arg2 = 0 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool temp2 = false ;
+  bool val2 ;
+  int ecode2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "filename", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetFilename",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetFilename" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnablePrinter" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnablePrinter" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetFilename((wxString const &)*arg2);
+    (arg1)->EnablePrinter(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  {
-    if (temp2)
-    delete arg2;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp2)
-    delete arg2;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_GetPrivData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  PyObject *result = 0 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_GetPrivData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetDefaultMinMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (PyObject *)wxPrintData_GetPrivData(arg1);
+    result = (bool)(arg1)->GetDefaultMinMargins();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = result;
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintData_SetPrivData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = (wxPrintData *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "data", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrivData",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintData_SetPrivData" "', expected argument " "1"" of type '" "wxPrintData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
-  arg2 = obj1;
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxPrintData_SetPrivData(arg1,arg2);
+    result = (bool)(arg1)->GetEnableMargins();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *PrintData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintData, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PrintData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
-  PyObject *resultobj = 0;
-  wxPageSetupDialogData *result = 0 ;
-  
-  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;

   {
   {

-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxPageSetupDialogData *)new wxPageSetupDialogData();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = 0 ;
-  wxPageSetupDialogData *result = 0 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPageSetupDialogData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableOrientation" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPageSetupDialogData const &)*arg1);
+    result = (bool)(arg1)->GetEnableOrientation();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = 0 ;
-  wxPageSetupDialogData *result = 0 ;
+  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnablePaper" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1);
+    result = (bool)(arg1)->GetEnablePaper();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  
-  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PageSetupDialogData",0,1,argv))) SWIG_fail;
-  --argc;
-  if (argc == 0) {
-    return _wrap_new_PageSetupDialogData__SWIG_0(self, argc, argv);
-  }
-  if (argc == 1) {
-    int _v = 0;
-    {
-      int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxPageSetupDialogData, 0);
-      _v = SWIG_CheckState(res);
-    }
-    if (!_v) goto check_2;
-    return _wrap_new_PageSetupDialogData__SWIG_1(self, argc, argv);
-  }
-check_2:
-  
-  if (argc == 1) {
-    return _wrap_new_PageSetupDialogData__SWIG_2(self, argc, argv);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   }

-  
+  return resultobj;

 fail:
 fail:

-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'");

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_PageSetupDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnablePrinter" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    result = (bool)(arg1)->GetEnablePrinter();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableHelp" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableHelp" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableHelp" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnableHelp(arg2);
+    result = (bool)(arg1)->GetEnableHelp();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetDefaultInfo" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableMargins" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnableMargins(arg2);
+    result = (bool)(arg1)->GetDefaultInfo();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;
+  wxPoint result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnableOrientation" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnableOrientation" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnableOrientation(arg2);
+    result = (arg1)->GetMarginTopLeft();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;
+  wxPoint result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnablePaper" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnablePaper" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnablePaper(arg2);
+    result = (arg1)->GetMarginBottomRight();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMinMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;
+  wxPoint result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_EnablePrinter" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMinMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_EnablePrinter" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnablePrinter(arg2);
+    result = (arg1)->GetMinMarginTopLeft();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMinMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  wxPoint result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -25066,28 +25720,26 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *SW
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetDefaultMinMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMinMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetDefaultMinMargins();
+    result = (arg1)->GetMinMarginBottomRight();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  wxPaperSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -25096,28 +25748,26 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *SWIGUN
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPaperId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetEnableMargins();
+    result = (wxPaperSize)(arg1)->GetPaperId();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  wxSize result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -25126,28 +25776,26 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *SW
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableOrientation" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetEnableOrientation();
+    result = (arg1)->GetPaperSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  wxPrintData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -25156,25 +25804,26 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *SWIGUNUS
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnablePaper" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPrintData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetEnablePaper();
+    {
+      wxPrintData &_result_ref = (arg1)->GetPrintData();
+      result = (wxPrintData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   bool result;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   bool result;


@@ -25186,12 +25835,12 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *SWIGUN
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnablePrinter" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_IsOk" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetEnablePrinter();
+    result = (bool)(arg1)->IsOk();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -25204,269 +25853,344 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetEnableHelp" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetDefaultInfo" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetDefaultInfo" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetEnableHelp();
+    (arg1)->SetDefaultInfo(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetDefaultInfo" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetDefaultMinMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetDefaultMinMargins" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->GetDefaultInfo();
+    (arg1)->SetDefaultMinMargins(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPoint result;
+  wxPoint *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxPoint temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pt", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMarginTopLeft",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetMarginTopLeft();
+    (arg1)->SetMarginTopLeft((wxPoint const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPoint result;
+  wxPoint *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxPoint temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pt", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMarginBottomRight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetMarginBottomRight();
+    (arg1)->SetMarginBottomRight((wxPoint const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMinMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMinMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPoint result;
+  wxPoint *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxPoint temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pt", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMinMarginTopLeft",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMinMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMinMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetMinMarginTopLeft();
+    (arg1)->SetMinMarginTopLeft((wxPoint const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetMinMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMinMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPoint result;
+  wxPoint *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxPoint temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pt", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMinMarginBottomRight",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetMinMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMinMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetMinMarginBottomRight();
+    (arg1)->SetMinMarginBottomRight((wxPoint const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPaperSize result;
+  wxPaperSize arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPaperId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPaperId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetPaperId" "', expected argument " "2"" of type '" "wxPaperSize""'");
+  } 
+  arg2 = static_cast< wxPaperSize >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPaperSize)(arg1)->GetPaperId();
+    (arg1)->SetPaperId(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxSize result;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  wxSize temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "size", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperSize",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+  }

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (arg1)->GetPaperSize();
+    (arg1)->SetPaperSize((wxSize const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  wxPrintData *result = 0 ;
+  wxPrintData *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "printData", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_GetPrintData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxPrintData * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPrintData &_result_ref = (arg1)->GetPrintData();
-      result = (wxPrintData *) &_result_ref;
-    }
+    (arg1)->SetPrintData((wxPrintData const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_CalculateIdFromPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -25475,52 +26199,39 @@ SWIGINTERN PyObject *_wrap_PageSetupDialogData_Ok(PyObject *SWIGUNUSEDPARM(self)
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_Ok" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_CalculateIdFromPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Ok();
+    (arg1)->CalculateIdFromPaperSize();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialogData_CalculatePaperSizeFromId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;

-  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetDefaultInfo" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_CalculatePaperSizeFromId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetDefaultInfo" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetDefaultInfo(arg2);
+    (arg1)->CalculatePaperSizeFromId();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -25531,70 +26242,77 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *PageSetupDialogData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPageSetupDialogData, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PageSetupDialogData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PageSetupDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  bool arg2 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxPageSetupDialogData *arg2 = (wxPageSetupDialogData *) NULL ;
+  wxPageSetupDialog *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "flag", NULL 
+    (char *) "parent",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PageSetupDialog",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetDefaultMinMargins" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialog" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PageSetupDialog" "', expected argument " "2"" of type '" "wxPageSetupDialogData *""'"); 
+    }
+    arg2 = reinterpret_cast< wxPageSetupDialogData * >(argp2);

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetDefaultMinMargins" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetDefaultMinMargins(arg2);
+    result = (wxPageSetupDialog *)new wxPageSetupDialog(arg1,arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialog, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_PageSetupDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPoint *arg2 = 0 ;
+  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pt", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMarginTopLeft",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PageSetupDialog" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMarginTopLeft((wxPoint const &)*arg2);
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -25605,246 +26323,231 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialog_GetPageSetupData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPoint *arg2 = 0 ;
+  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
+  wxPageSetupDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pt", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMarginBottomRight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_GetPageSetupData" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMarginBottomRight((wxPoint const &)*arg2);
+    {
+      wxPageSetupDialogData &_result_ref = (arg1)->GetPageSetupData();
+      result = (wxPageSetupDialogData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMinMarginTopLeft(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialog_GetPageSetupDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPoint *arg2 = 0 ;
+  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
+  wxPageSetupDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pt", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMinMarginTopLeft",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMinMarginTopLeft" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_GetPageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMinMarginTopLeft((wxPoint const &)*arg2);
+    {
+      wxPageSetupDialogData &_result_ref = (arg1)->GetPageSetupDialogData();
+      result = (wxPageSetupDialogData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetMinMarginBottomRight(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPoint *arg2 = 0 ;
+  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "pt", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetMinMarginBottomRight",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetMinMarginBottomRight" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_ShowModal" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMinMarginBottomRight((wxPoint const &)*arg2);
+    result = (int)(arg1)->ShowModal();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *PageSetupDialog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPageSetupDialog, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PageSetupDialog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPaperSize arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "id", NULL 
-  };
+  wxPrintDialogData *result = 0 ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPaperId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PageSetupDialogData_SetPaperId" "', expected argument " "2"" of type '" "wxPaperSize""'");
-  } 
-  arg2 = static_cast< wxPaperSize >(val2);
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPaperId(arg2);
+    result = (wxPrintDialogData *)new wxPrintDialogData();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxSize *arg2 = 0 ;
+  wxPrintData *arg1 = 0 ;
+  wxPrintDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "size", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperSize",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  {
-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPrintData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPaperSize((wxSize const &)*arg2);
+    result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintData const &)*arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
-  wxPrintData *arg2 = 0 ;
+  wxPrintDialogData *arg1 = 0 ;
+  wxPrintDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "printData", NULL 
-  };

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintDialogData,  0  | 0);

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData const &""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PageSetupDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData const &""'"); 

   }
   }

-  arg2 = reinterpret_cast< wxPrintData * >(argp2);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPrintData((wxPrintData const &)*arg2);
+    result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintDialogData const &)*arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_CalculateIdFromPaperSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PrintDialogData",0,1,argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_PrintDialogData__SWIG_0(self, argc, argv);
+  }
+  if (argc == 1) {
+    int _v = 0;
+    {
+      int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxPrintData, 0);
+      _v = SWIG_CheckState(res);
+    }
+    if (!_v) goto check_2;
+    return _wrap_new_PrintDialogData__SWIG_1(self, argc, argv);
+  }
+check_2:
+  
+  if (argc == 1) {
+    return _wrap_new_PrintDialogData__SWIG_2(self, argc, argv);
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintDialogData'");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_CalculateIdFromPaperSize" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->CalculateIdFromPaperSize();
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -25855,339 +26558,294 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialogData_CalculatePaperSizeFromId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialogData_CalculatePaperSizeFromId" "', expected argument " "1"" of type '" "wxPageSetupDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetFromPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->CalculatePaperSizeFromId();
+    result = (int)((wxPrintDialogData const *)arg1)->GetFromPage();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *PageSetupDialogData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPageSetupDialogData, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PageSetupDialogData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PageSetupDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxPageSetupDialogData *arg2 = (wxPageSetupDialogData *) NULL ;
-  wxPageSetupDialog *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "parent",(char *) "data", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PageSetupDialog",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PageSetupDialog" "', expected argument " "1"" of type '" "wxWindow *""'"); 
-  }
-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  if (obj1) {
-    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PageSetupDialog" "', expected argument " "2"" of type '" "wxPageSetupDialogData *""'"); 
-    }
-    arg2 = reinterpret_cast< wxPageSetupDialogData * >(argp2);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetToPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPageSetupDialog *)new wxPageSetupDialog(arg1,arg2);
+    result = (int)((wxPrintDialogData const *)arg1)->GetToPage();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialog, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_PageSetupDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PageSetupDialog" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetMinPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    result = (int)((wxPrintDialogData const *)arg1)->GetMinPage();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialog_GetPageSetupData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
-  wxPageSetupDialogData *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_GetPageSetupData" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetMaxPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPageSetupDialogData &_result_ref = (arg1)->GetPageSetupData();
-      result = (wxPageSetupDialogData *) &_result_ref;
-    }
+    result = (int)((wxPrintDialogData const *)arg1)->GetMaxPage();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialog_GetPageSetupDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
-  wxPageSetupDialogData *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_GetPageSetupDialogData" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetNoCopies" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPageSetupDialogData &_result_ref = (arg1)->GetPageSetupDialogData();
-      result = (wxPageSetupDialogData *) &_result_ref;
-    }
+    result = (int)((wxPrintDialogData const *)arg1)->GetNoCopies();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPageSetupDialogData, 0 |  0 );
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
-  int result;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPageSetupDialog, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PageSetupDialog_ShowModal" "', expected argument " "1"" of type '" "wxPageSetupDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetAllPages" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPageSetupDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)(arg1)->ShowModal();
+    result = (bool)((wxPrintDialogData const *)arg1)->GetAllPages();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *PageSetupDialog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPageSetupDialog, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PageSetupDialog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetSelection" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintDialogData *)new wxPrintDialogData();
+    result = (bool)((wxPrintDialogData const *)arg1)->GetSelection();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintData *arg1 = 0 ;
-  wxPrintDialogData *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetCollate" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintData const &)*arg1);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetCollate();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_new_PrintDialogData__SWIG_2(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = 0 ;
-  wxPrintDialogData *result = 0 ;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  PyObject *swig_obj[1] ;

   
   

-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxPrintDialogData,  0  | 0);
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData const &""'"); 
-  }
-  if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetPrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintDialogData const &)*arg1);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetPrintToFile();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  
-  if (!(argc = SWIG_Python_UnpackTuple(args,"new_PrintDialogData",0,1,argv))) SWIG_fail;
-  --argc;
-  if (argc == 0) {
-    return _wrap_new_PrintDialogData__SWIG_0(self, argc, argv);
-  }
-  if (argc == 1) {
-    int _v = 0;
-    {
-      int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxPrintData, 0);
-      _v = SWIG_CheckState(res);
-    }
-    if (!_v) goto check_2;
-    return _wrap_new_PrintDialogData__SWIG_1(self, argc, argv);
-  }
-check_2:
-  
-  if (argc == 1) {
-    return _wrap_new_PrintDialogData__SWIG_2(self, argc, argv);
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);

   }
   }

-  
+  return resultobj;

 fail:
 fail:

-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintDialogData'");

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_PrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetFromPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetFromPage" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    (arg1)->SetFromPage(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26198,294 +26856,376 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetFromPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetToPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetToPage" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxPrintDialogData const *)arg1)->GetFromPage();
+    (arg1)->SetToPage(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetToPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetMinPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetMinPage" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxPrintDialogData const *)arg1)->GetToPage();
+    (arg1)->SetMinPage(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetMinPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetMaxPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetMaxPage" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxPrintDialogData const *)arg1)->GetMinPage();
+    (arg1)->SetMaxPage(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int result;
+  int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "v", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetMaxPage" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetNoCopies" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetNoCopies" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxPrintDialogData const *)arg1)->GetMaxPage();
+    (arg1)->SetNoCopies(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetNoCopies" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetAllPages" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetAllPages" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)((wxPrintDialogData const *)arg1)->GetNoCopies();
+    (arg1)->SetAllPages(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetAllPages" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetSelection" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetSelection" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetAllPages();
+    (arg1)->SetSelection(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetSelection" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetCollate" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetCollate" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetSelection();
+    (arg1)->SetCollate(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetCollate" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetPrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetPrintToFile" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetCollate();
+    (arg1)->SetPrintToFile(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool result;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "flag", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetPrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnablePrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnablePrintToFile" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetPrintToFile();
+    (arg1)->EnablePrintToFile(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int arg2 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "v", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetFromPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnableSelection" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetFromPage" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnableSelection" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetFromPage(arg2);
+    (arg1)->EnableSelection(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26496,34 +27236,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int arg2 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "v", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetToPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnablePageNumbers" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetToPage" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnablePageNumbers" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetToPage(arg2);
+    (arg1)->EnablePageNumbers(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26534,34 +27274,34 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int arg2 ;
+  bool arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
+  bool val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "v", NULL 
+    (char *) "self",(char *) "flag", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetMinPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnableHelp" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetMinPage" "', expected argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnableHelp" "', expected argument " "2"" of type '" "bool""'");

   } 
   } 

-  arg2 = static_cast< int >(val2);
+  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMinPage(arg2);
+    (arg1)->EnableHelp(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26572,262 +27312,218 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "v", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetMaxPage" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnablePrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetMaxPage" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetMaxPage(arg2);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetEnablePrintToFile();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  int arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  int val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "v", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetNoCopies" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnableSelection" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetNoCopies" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetNoCopies(arg2);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetEnableSelection();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetAllPages" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnablePageNumbers" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetAllPages" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetAllPages(arg2);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetEnablePageNumbers();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetSelection" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnableHelp" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetSelection" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetSelection(arg2);
+    result = (bool)((wxPrintDialogData const *)arg1)->GetEnableHelp();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetCollate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool arg2 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetCollate" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_IsOk" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetCollate" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetCollate(arg2);
+    result = (bool)((wxPrintDialogData const *)arg1)->IsOk();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool arg2 ;
+  wxPrintData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetPrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetPrintData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_SetPrintToFile" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPrintToFile(arg2);
+    {
+      wxPrintData &_result_ref = (arg1)->GetPrintData();
+      result = (wxPrintData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialogData_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
   PyObject *resultobj = 0;
   wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;

-  bool arg2 ;
+  wxPrintData *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "flag", NULL 
+    (char *) "self",(char *) "printData", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnablePrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetPrintData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
   }
   arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnablePrintToFile" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PrintDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PrintDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxPrintData * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnablePrintToFile(arg2);
+    (arg1)->SetPrintData((wxPrintData const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26838,72 +27534,77 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *PrintDialogData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintDialogData, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PrintDialogData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool arg2 ;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxPrintDialogData *arg2 = (wxPrintDialogData *) NULL ;
+  wxPrintDialog *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "flag", NULL 
+    (char *) "parent",(char *) "data", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PrintDialog",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnableSelection" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialog" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PrintDialog" "', expected argument " "2"" of type '" "wxPrintDialogData *""'"); 
+    }
+    arg2 = reinterpret_cast< wxPrintDialogData * >(argp2);

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnableSelection" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnableSelection(arg2);
+    result = (wxPrintDialog *)new wxPrintDialog(arg1,arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialog, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_delete_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool arg2 ;
+  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnablePageNumbers" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintDialog" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnablePageNumbers" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
+  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnablePageNumbers(arg2);
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -26914,127 +27615,119 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_PrintDialog_ShowModal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool arg2 ;
+  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  bool val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "flag", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_EnableHelp" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_ShowModal" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
-  ecode2 = SWIG_AsVal_bool(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PrintDialogData_EnableHelp" "', expected argument " "2"" of type '" "bool""'");
-  } 
-  arg2 = static_cast< bool >(val2);
+  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->EnableHelp(arg2);
+    result = (int)(arg1)->ShowModal();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool result;
+  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  wxPrintDialogData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnablePrintToFile" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetEnablePrintToFile();
+    {
+      wxPrintDialogData &_result_ref = (arg1)->GetPrintDialogData();
+      result = (wxPrintDialogData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool result;
+SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  wxPrintData *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnableSelection" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintData" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetEnableSelection();
+    {
+      wxPrintData &_result_ref = (arg1)->GetPrintData();
+      result = (wxPrintData *) &_result_ref;
+    }

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool result;
+  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  wxDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnablePageNumbers" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintDC" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetEnablePageNumbers();
+    result = (wxDC *)(arg1)->GetPrintDC();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); 

   }
   return resultobj;
 fail:
   }
   return resultobj;
 fail:


@@ -27042,154 +27735,196 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *PrintDialog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintDialog, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PrintDialog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_Printer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool result;
+  wxPrintDialogData *arg1 = (wxPrintDialogData *) NULL ;
+  wxPrinter *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "data", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetEnableHelp" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Printer",kwnames,&obj0)) SWIG_fail;
+  if (obj0) {
+    res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Printer" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    }
+    arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   {
   {

+    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->GetEnableHelp();
+    result = (wxPrinter *)new wxPrinter(arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrinter, SWIG_POINTER_NEW |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Printer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  bool result;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_Ok" "', expected argument " "1"" of type '" "wxPrintDialogData const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Printer" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)((wxPrintDialogData const *)arg1)->Ok();
+    delete arg1;
+    

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_CreateAbortWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  wxPrintData *result = 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
+  wxWindow *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "parent",(char *) "printout", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printer_CreateAbortWindow",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_GetPrintData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_CreateAbortWindow" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_CreateAbortWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_CreateAbortWindow" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPrintData &_result_ref = (arg1)->GetPrintData();
-      result = (wxPrintData *) &_result_ref;
-    }
+    result = (wxWindow *)(arg1)->CreateAbortWindow(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialogData_SetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printer_ReportError(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
-  wxPrintData *arg2 = 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
+  wxString *arg4 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;

+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool temp4 = false ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "printData", NULL 
+    (char *) "self",(char *) "parent",(char *) "printout",(char *) "message", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintData",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Printer_ReportError",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialogData_SetPrintData" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_ReportError" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPrintData,  0  | 0);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PrintDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_ReportError" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

-  if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PrintDialogData_SetPrintData" "', expected argument " "2"" of type '" "wxPrintData const &""'"); 
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_ReportError" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);
+  {
+    arg4 = wxString_in_helper(obj3);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;

   }
   }

-  arg2 = reinterpret_cast< wxPrintData * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetPrintData((wxPrintData const &)*arg2);
+    (arg1)->ReportError(arg2,arg3,(wxString const &)*arg4);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *PrintDialogData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintDialogData, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PrintDialogData_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printer_Setup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxWindow *arg1 = (wxWindow *) 0 ;
-  wxPrintDialogData *arg2 = (wxPrintDialogData *) NULL ;
-  wxPrintDialog *result = 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -27197,95 +27932,140 @@ SWIGINTERN PyObject *_wrap_new_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "parent",(char *) "data", NULL 
+    (char *) "self",(char *) "parent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_PrintDialog",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printer_Setup",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PrintDialog" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_Setup" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxWindow * >(argp1);
-  if (obj1) {
-    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PrintDialog" "', expected argument " "2"" of type '" "wxPrintDialogData *""'"); 
-    }
-    arg2 = reinterpret_cast< wxPrintDialogData * >(argp2);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_Setup" "', expected argument " "2"" of type '" "wxWindow *""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxWindow * >(argp2);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrintDialog *)new wxPrintDialog(arg1,arg2);
+    result = (bool)(arg1)->Setup(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialog, SWIG_POINTER_NEW |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_Print(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
+  bool arg4 = (bool) true ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "parent",(char *) "printout",(char *) "prompt", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, SWIG_POINTER_DISOWN |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Printer_Print",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PrintDialog" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_Print" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_Print" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_Print" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_bool(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Printer_Print" "', expected argument " "4"" of type '" "bool""'");
+    } 
+    arg4 = static_cast< bool >(val4);

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    result = (bool)(arg1)->Print(arg2,arg3,arg4);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialog_ShowModal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
-  int result;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxDC *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "parent", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printer_PrintDialog",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_ShowModal" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_PrintDialog" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_PrintDialog" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (int)(arg1)->ShowModal();
+    result = (wxDC *)(arg1)->PrintDialog(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_GetPrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;

   wxPrintDialogData *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxPrintDialogData *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;


@@ -27293,15 +28073,15 @@ SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *SWIGUNUSEDPA
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintDialogData" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_GetPrintDialogData" "', expected argument " "1"" of type '" "wxPrinter const *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     {
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     {

-      wxPrintDialogData &_result_ref = (arg1)->GetPrintDialogData();
+      wxPrintDialogData &_result_ref = ((wxPrinter const *)arg1)->GetPrintDialogData();

       result = (wxPrintDialogData *) &_result_ref;
     }
     wxPyEndAllowThreads(__tstate);
       result = (wxPrintDialogData *) &_result_ref;
     }
     wxPyEndAllowThreads(__tstate);


@@ -27314,125 +28094,120 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_GetAbort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
-  wxPrintData *result = 0 ;
+  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintData" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_GetAbort" "', expected argument " "1"" of type '" "wxPrinter *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);
+  arg1 = reinterpret_cast< wxPrinter * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPrintData &_result_ref = (arg1)->GetPrintData();
-      result = (wxPrintData *) &_result_ref;
-    }
+    result = (bool)(arg1)->GetAbort();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintData, 0 |  0 );
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printer_GetLastError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
-  wxDC *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
+  wxPrinterError result;

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintDialog, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintDialog_GetPrintDC" "', expected argument " "1"" of type '" "wxPrintDialog *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPrintDialog * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"Printer_GetLastError",0,0,0)) SWIG_fail;

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxDC *)(arg1)->GetPrintDC();
+    result = (wxPrinterError)wxPrinter::GetLastError();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_OWN); 
-  }
+  resultobj = SWIG_From_int(static_cast< int >(result));

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *PrintDialog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Printer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;

-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrintDialog, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrinter, SWIG_NewClientData(obj));

   return SWIG_Py_Void();
 }
 
   return SWIG_Py_Void();
 }
 

-SWIGINTERN PyObject *PrintDialog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *Printer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

-SWIGINTERN PyObject *_wrap_new_Printer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_new_Printout(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrintDialogData *arg1 = (wxPrintDialogData *) NULL ;
-  wxPrinter *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
+  wxString const &arg1_defvalue = wxPyPrintoutTitleStr ;
+  wxString *arg1 = (wxString *) &arg1_defvalue ;
+  wxPyPrintout *result = 0 ;
+  bool temp1 = false ;

   PyObject * obj0 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   char *  kwnames[] = {

-    (char *) "data", NULL 
+    (char *) "title", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Printer",kwnames,&obj0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Printout",kwnames,&obj0)) SWIG_fail;

   if (obj0) {
   if (obj0) {

-    res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Printer" "', expected argument " "1"" of type '" "wxPrintDialogData *""'"); 
+    {
+      arg1 = wxString_in_helper(obj0);
+      if (arg1 == NULL) SWIG_fail;
+      temp1 = true;

     }
     }

-    arg1 = reinterpret_cast< wxPrintDialogData * >(argp1);

   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrinter *)new wxPrinter(arg1);
+    result = (wxPyPrintout *)new wxPyPrintout((wxString const &)*arg1);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrinter, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_NEW |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp1)
+    delete arg1;
+  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Printer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_Printout(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Printer" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Printout" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     delete arg1;
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     delete arg1;


@@ -27447,49 +28222,98 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_CreateAbortWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
-  wxWindow *result = 0 ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "parent",(char *) "printout", NULL 
+    (char *) "self",(char *) "self",(char *) "_class", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printer_CreateAbortWindow",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_CreateAbortWindow" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_CreateAbortWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxWindow * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_CreateAbortWindow" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Printout_GetTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetTitle" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxPyPrintout const *)arg1)->GetTitle();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Printout_GetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxDC *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetDC" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxWindow *)(arg1)->CreateAbortWindow(arg2,arg3);
+    result = (wxDC *)(arg1)->GetDC();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

-    resultobj = wxPyMake_wxObject(result, 0); 
+    resultobj = wxPyMake_wxObject(result, (bool)0); 

   }
   return resultobj;
 fail:
   }
   return resultobj;
 fail:


@@ -27497,344 +28321,260 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_ReportError(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_SetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
-  wxString *arg4 = 0 ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;

-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  bool temp4 = false ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "parent",(char *) "printout",(char *) "message", NULL 
+    (char *) "self",(char *) "dc", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Printer_ReportError",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetDC",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_ReportError" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_SetDC" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_ReportError" "', expected argument " "2"" of type '" "wxWindow *""'"); 
-  }
-  arg2 = reinterpret_cast< wxWindow * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_ReportError" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
-  }
-  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);
-  {
-    arg4 = wxString_in_helper(obj3);
-    if (arg4 == NULL) SWIG_fail;
-    temp4 = true;
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printout_SetDC" "', expected argument " "2"" of type '" "wxDC *""'"); 

   }
   }

+  arg2 = reinterpret_cast< wxDC * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->ReportError(arg2,arg3,(wxString const &)*arg4);
+    (arg1)->SetDC(arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
   resultobj = SWIG_Py_Void();

-  {
-    if (temp4)
-    delete arg4;
-  }

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp4)
-    delete arg4;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_Setup(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_FitThisSizeToPaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  bool result;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "parent", NULL 
+    (char *) "self",(char *) "imageSize", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printer_Setup",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_FitThisSizeToPaper",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_Setup" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_FitThisSizeToPaper" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_Setup" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxWindow * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Setup(arg2);
+    (arg1)->FitThisSizeToPaper((wxSize const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_Print(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_FitThisSizeToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
-  bool arg4 = (bool) true ;
-  bool result;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxSize *arg2 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
-  bool val4 ;
-  int ecode4 = 0 ;
+  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

-  PyObject * obj2 = 0 ;
-  PyObject * obj3 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "parent",(char *) "printout",(char *) "prompt", NULL 
+    (char *) "self",(char *) "imageSize", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Printer_Print",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_FitThisSizeToPage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_Print" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_Print" "', expected argument " "2"" of type '" "wxWindow *""'"); 
-  }
-  arg2 = reinterpret_cast< wxWindow * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printer_Print" "', expected argument " "3"" of type '" "wxPyPrintout *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_FitThisSizeToPage" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg3 = reinterpret_cast< wxPyPrintout * >(argp3);
-  if (obj3) {
-    ecode4 = SWIG_AsVal_bool(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Printer_Print" "', expected argument " "4"" of type '" "bool""'");
-    } 
-    arg4 = static_cast< bool >(val4);
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Print(arg2,arg3,arg4);
+    (arg1)->FitThisSizeToPage((wxSize const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_PrintDialog(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_FitThisSizeToPageMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxWindow *arg2 = (wxWindow *) 0 ;
-  wxDC *result = 0 ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxSize *arg2 = 0 ;
+  wxPageSetupDialogData *arg3 = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  wxSize temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

+  PyObject * obj2 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "parent", NULL 
+    (char *) "self",(char *) "imageSize",(char *) "pageSetupData", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printer_PrintDialog",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_FitThisSizeToPageMargins",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_PrintDialog" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_FitThisSizeToPageMargins" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printer_PrintDialog" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;

   }
   }

-  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxPageSetupDialogData,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Printout_FitThisSizeToPageMargins" "', expected argument " "3"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Printout_FitThisSizeToPageMargins" "', expected argument " "3"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxPageSetupDialogData * >(argp3);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxDC *)(arg1)->PrintDialog(arg2);
+    (arg1)->FitThisSizeToPageMargins((wxSize const &)*arg2,(wxPageSetupDialogData const &)*arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-    resultobj = wxPyMake_wxObject(result, (bool)0); 
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_GetPrintDialogData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printout_MapScreenSizeToPaper(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  wxPrintDialogData *result = 0 ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_GetPrintDialogData" "', expected argument " "1"" of type '" "wxPrinter const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_MapScreenSizeToPaper" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    {
-      wxPrintDialogData &_result_ref = ((wxPrinter const *)arg1)->GetPrintDialogData();
-      result = (wxPrintDialogData *) &_result_ref;
-    }
+    (arg1)->MapScreenSizeToPaper();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPrintDialogData, 0 |  0 );
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printer_GetAbort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printout_MapScreenSizeToPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxPrinter *arg1 = (wxPrinter *) 0 ;
-  bool result;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrinter, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printer_GetAbort" "', expected argument " "1"" of type '" "wxPrinter *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPrinter * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->GetAbort();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_MapScreenSizeToPage" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   }

-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Printer_GetLastError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxPrinterError result;
-  
-  if (!SWIG_Python_UnpackTuple(args,"Printer_GetLastError",0,0,0)) SWIG_fail;
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPrinterError)wxPrinter::GetLastError();
+    (arg1)->MapScreenSizeToPage();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_int(static_cast< int >(result));
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *Printer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_wxPrinter, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Printer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_Printout(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_MapScreenSizeToPageMargins(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   PyObject *resultobj = 0;

-  wxString const &arg1_defvalue = wxPyPrintoutTitleStr ;
-  wxString *arg1 = (wxString *) &arg1_defvalue ;
-  wxPyPrintout *result = 0 ;
-  bool temp1 = false ;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxPageSetupDialogData *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj0 = 0 ;

+  PyObject * obj1 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "title", NULL 
+    (char *) "self",(char *) "pageSetupData", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Printout",kwnames,&obj0)) SWIG_fail;
-  if (obj0) {
-    {
-      arg1 = wxString_in_helper(obj0);
-      if (arg1 == NULL) SWIG_fail;
-      temp1 = true;
-    }
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_MapScreenSizeToPageMargins",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_MapScreenSizeToPageMargins" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPageSetupDialogData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printout_MapScreenSizeToPageMargins" "', expected argument " "2"" of type '" "wxPageSetupDialogData const &""'"); 

   }
   }

+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Printout_MapScreenSizeToPageMargins" "', expected argument " "2"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxPageSetupDialogData * >(argp2);

   {
   {

-    if (!wxPyCheckForApp()) SWIG_fail;

     PyThreadState* __tstate = wxPyBeginAllowThreads();
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxPyPrintout *)new wxPyPrintout((wxString const &)*arg1);
+    (arg1)->MapScreenSizeToPageMargins((wxPageSetupDialogData const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_NEW |  0 );
-  {
-    if (temp1)
-    delete arg1;
-  }
+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return resultobj;
 fail:

-  {
-    if (temp1)
-    delete arg1;
-  }

   return NULL;
 }
 
 
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_delete_Printout(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printout_MapScreenSizeToDevice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   void *argp1 = 0 ;
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   void *argp1 = 0 ;


@@ -27843,15 +28583,14 @@ SWIGINTERN PyObject *_wrap_delete_Printout(PyObject *SWIGUNUSEDPARM(self), PyObj
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;

-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Printout" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_MapScreenSizeToDevice" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    delete arg1;
-    
+    (arg1)->MapScreenSizeToDevice();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -27862,45 +28601,38 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_Printout__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_GetLogicalPaperRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

-  PyObject *arg2 = (PyObject *) 0 ;
-  PyObject *arg3 = (PyObject *) 0 ;
+  wxRect result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "self",(char *) "_class", NULL 
-  };
+  PyObject *swig_obj[1] ;

   
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetLogicalPaperRect" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 

   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

-  arg2 = obj1;
-  arg3 = obj2;

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->_setCallbackInfo(arg2,arg3);
+    result = ((wxPyPrintout const *)arg1)->GetLogicalPaperRect();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printout_GetTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printout_GetLogicalPageRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

-  wxString result;
+  wxRect result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -27909,86 +28641,148 @@ SWIGINTERN PyObject *_wrap_Printout_GetTitle(PyObject *SWIGUNUSEDPARM(self), PyO
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetTitle" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetLogicalPageRect" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 

   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxPyPrintout const *)arg1)->GetTitle();
+    result = ((wxPyPrintout const *)arg1)->GetLogicalPageRect();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  {
-#if wxUSE_UNICODE
-    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
-#else
-    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
-#endif
-  }
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printout_GetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Printout_GetLogicalPageMarginsRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

-  wxDC *result = 0 ;
+  wxPageSetupDialogData *arg2 = 0 ;
+  wxRect result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  PyObject *swig_obj[1] ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pageSetupData", NULL 
+  };

   
   

-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_GetLogicalPageMarginsRect",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetDC" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetLogicalPageMarginsRect" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 

   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxPageSetupDialogData,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printout_GetLogicalPageMarginsRect" "', expected argument " "2"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Printout_GetLogicalPageMarginsRect" "', expected argument " "2"" of type '" "wxPageSetupDialogData const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxPageSetupDialogData * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxDC *)(arg1)->GetDC();
+    result = ((wxPyPrintout const *)arg1)->GetLogicalPageMarginsRect((wxPageSetupDialogData const &)*arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Printout_SetLogicalOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "y", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_SetLogicalOrigin" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Printout_SetLogicalOrigin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Printout_SetLogicalOrigin" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

   {
   {

-    resultobj = wxPyMake_wxObject(result, (bool)0); 
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLogicalOrigin(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;

   }
   }

+  resultobj = SWIG_Py_Void();

   return resultobj;
 fail:
   return NULL;
 }
 
 
   return resultobj;
 fail:
   return NULL;
 }
 
 

-SWIGINTERN PyObject *_wrap_Printout_SetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_Printout_OffsetLogicalOrigin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;

-  wxDC *arg2 = (wxDC *) 0 ;
+  int arg2 ;
+  int arg3 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;
-  int res2 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;

+  PyObject * obj2 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "self",(char *) "dc", NULL 
+    (char *) "self",(char *) "xoff",(char *) "yoff", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetDC",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_OffsetLogicalOrigin",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;

   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_SetDC" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_OffsetLogicalOrigin" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 

   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
   }
   arg1 = reinterpret_cast< wxPyPrintout * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Printout_SetDC" "', expected argument " "2"" of type '" "wxDC *""'"); 
-  }
-  arg2 = reinterpret_cast< wxDC * >(argp2);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Printout_OffsetLogicalOrigin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Printout_OffsetLogicalOrigin" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->SetDC(arg2);
+    (arg1)->OffsetLogicalOrigin(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -28375,6 +29169,70 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_Printout_SetPaperRectPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxRect *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxRect temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "paperRectPixels", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetPaperRectPixels",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_SetPaperRectPixels" "', expected argument " "1"" of type '" "wxPyPrintout *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetPaperRectPixels((wxRect const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Printout_GetPaperRectPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
+  wxRect result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyPrintout, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Printout_GetPaperRectPixels" "', expected argument " "1"" of type '" "wxPyPrintout const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyPrintout * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxPyPrintout const *)arg1)->GetPaperRectPixels();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_Printout_IsPreview(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
 SWIGINTERN PyObject *_wrap_Printout_IsPreview(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;


@@ -30159,7 +31017,7 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_PrintPreview_Ok(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_PrintPreview_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;
   wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
   bool result;
   PyObject *resultobj = 0;
   wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
   bool result;


@@ -30171,12 +31029,12 @@ SWIGINTERN PyObject *_wrap_PrintPreview_Ok(PyObject *SWIGUNUSEDPARM(self), PyObj
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintPreview, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPrintPreview, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintPreview_Ok" "', expected argument " "1"" of type '" "wxPrintPreview *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PrintPreview_IsOk" "', expected argument " "1"" of type '" "wxPrintPreview *""'"); 

   }
   arg1 = reinterpret_cast< wxPrintPreview * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxPrintPreview * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (bool)(arg1)->Ok();
+    result = (bool)(arg1)->IsOk();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }


@@ -30475,7 +31333,6 @@ SWIGINTERN PyObject *_wrap_new_PyPreviewFrame(PyObject *SWIGUNUSEDPARM(self), Py
   wxString const &arg7_defvalue = wxPyFrameNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxPyPreviewFrame *result = 0 ;
   wxString const &arg7_defvalue = wxPyFrameNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxPyPreviewFrame *result = 0 ;

-  void *argp1 = 0 ;

   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;


@@ -30497,11 +31354,10 @@ SWIGINTERN PyObject *_wrap_new_PyPreviewFrame(PyObject *SWIGUNUSEDPARM(self), Py
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;

-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintPreview, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPrintPreview, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPreviewFrame" "', expected argument " "1"" of type '" "wxPrintPreview *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPreviewFrame" "', expected argument " "1"" of type '" "wxPrintPreview *""'");

   }
   }

-  arg1 = reinterpret_cast< wxPrintPreview * >(argp1);

   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFrame, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PyPreviewFrame" "', expected argument " "2"" of type '" "wxFrame *""'"); 
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFrame, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PyPreviewFrame" "', expected argument " "2"" of type '" "wxFrame *""'"); 


@@ -30784,7 +31640,6 @@ SWIGINTERN PyObject *_wrap_new_PyPreviewControlBar(PyObject *SWIGUNUSEDPARM(self
   wxString const &arg7_defvalue = wxPyPanelNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxPyPreviewControlBar *result = 0 ;
   wxString const &arg7_defvalue = wxPyPanelNameStr ;
   wxString *arg7 = (wxString *) &arg7_defvalue ;
   wxPyPreviewControlBar *result = 0 ;

-  void *argp1 = 0 ;

   int res1 = 0 ;
   long val2 ;
   int ecode2 = 0 ;
   int res1 = 0 ;
   long val2 ;
   int ecode2 = 0 ;


@@ -30807,11 +31662,10 @@ SWIGINTERN PyObject *_wrap_new_PyPreviewControlBar(PyObject *SWIGUNUSEDPARM(self
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;

-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPrintPreview, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPrintPreview, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res1)) {
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPreviewControlBar" "', expected argument " "1"" of type '" "wxPrintPreview *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PyPreviewControlBar" "', expected argument " "1"" of type '" "wxPrintPreview *""'");

   }
   }

-  arg1 = reinterpret_cast< wxPrintPreview * >(argp1);

   ecode2 = SWIG_AsVal_long(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyPreviewControlBar" "', expected argument " "2"" of type '" "long""'");
   ecode2 = SWIG_AsVal_long(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PyPreviewControlBar" "', expected argument " "2"" of type '" "long""'");


@@ -30911,7 +31765,6 @@ SWIGINTERN PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *SWIGUNU
   wxPrintPreview *arg2 = (wxPrintPreview *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxPrintPreview *arg2 = (wxPrintPreview *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;

   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int res2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;


@@ -30925,11 +31778,10 @@ SWIGINTERN PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPreviewControlBar_SetPrintPreview" "', expected argument " "1"" of type '" "wxPyPreviewControlBar *""'"); 
   }
   arg1 = reinterpret_cast< wxPyPreviewControlBar * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyPreviewControlBar_SetPrintPreview" "', expected argument " "1"" of type '" "wxPyPreviewControlBar *""'"); 
   }
   arg1 = reinterpret_cast< wxPyPreviewControlBar * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPrintPreview, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxPrintPreview, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyPreviewControlBar_SetPrintPreview" "', expected argument " "2"" of type '" "wxPrintPreview *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyPreviewControlBar_SetPrintPreview" "', expected argument " "2"" of type '" "wxPrintPreview *""'");

   }
   }

-  arg2 = reinterpret_cast< wxPrintPreview * >(argp2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetPrintPreview(arg2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetPrintPreview(arg2);


@@ -31066,13 +31918,13 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"TopLevelWindow_IsFullScreen", (PyCFunction)_wrap_TopLevelWindow_IsFullScreen, METH_O, NULL},
         { (char *)"TopLevelWindow_SetTitle", (PyCFunction) _wrap_TopLevelWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_GetTitle", (PyCFunction)_wrap_TopLevelWindow_GetTitle, METH_O, NULL},
         { (char *)"TopLevelWindow_IsFullScreen", (PyCFunction)_wrap_TopLevelWindow_IsFullScreen, METH_O, NULL},
         { (char *)"TopLevelWindow_SetTitle", (PyCFunction) _wrap_TopLevelWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_GetTitle", (PyCFunction)_wrap_TopLevelWindow_GetTitle, METH_O, NULL},

+        { (char *)"TopLevelWindow_EnableCloseButton", (PyCFunction) _wrap_TopLevelWindow_EnableCloseButton, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_RequestUserAttention", (PyCFunction) _wrap_TopLevelWindow_RequestUserAttention, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_IsActive", (PyCFunction)_wrap_TopLevelWindow_IsActive, METH_O, NULL},
         { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction)_wrap_TopLevelWindow_MacGetMetalAppearance, METH_O, NULL},
         { (char *)"TopLevelWindow_CenterOnScreen", (PyCFunction) _wrap_TopLevelWindow_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_RequestUserAttention", (PyCFunction) _wrap_TopLevelWindow_RequestUserAttention, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_IsActive", (PyCFunction)_wrap_TopLevelWindow_IsActive, METH_O, NULL},
         { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction)_wrap_TopLevelWindow_MacGetMetalAppearance, METH_O, NULL},
         { (char *)"TopLevelWindow_CenterOnScreen", (PyCFunction) _wrap_TopLevelWindow_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"TopLevelWindow_EnableCloseButton", (PyCFunction) _wrap_TopLevelWindow_EnableCloseButton, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"TopLevelWindow_GetDefaultItem", (PyCFunction)_wrap_TopLevelWindow_GetDefaultItem, METH_O, NULL},
         { (char *)"TopLevelWindow_SetDefaultItem", (PyCFunction) _wrap_TopLevelWindow_SetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_SetTmpDefaultItem", (PyCFunction) _wrap_TopLevelWindow_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_GetDefaultItem", (PyCFunction)_wrap_TopLevelWindow_GetDefaultItem, METH_O, NULL},
         { (char *)"TopLevelWindow_SetDefaultItem", (PyCFunction) _wrap_TopLevelWindow_SetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TopLevelWindow_SetTmpDefaultItem", (PyCFunction) _wrap_TopLevelWindow_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31112,7 +31964,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Dialog_SetEscapeId", (PyCFunction) _wrap_Dialog_SetEscapeId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_GetEscapeId", (PyCFunction)_wrap_Dialog_GetEscapeId, METH_O, NULL},
         { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_SetEscapeId", (PyCFunction) _wrap_Dialog_SetEscapeId, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_GetEscapeId", (PyCFunction)_wrap_Dialog_GetEscapeId, METH_O, NULL},
         { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog__CreateButtonSizer", (PyCFunction) _wrap_Dialog__CreateButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Dialog_CreateSeparatedButtonSizer", (PyCFunction) _wrap_Dialog_CreateSeparatedButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Dialog_CreateStdDialogButtonSizer", (PyCFunction) _wrap_Dialog_CreateStdDialogButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_IsModal", (PyCFunction)_wrap_Dialog_IsModal, METH_O, NULL},
         { (char *)"Dialog_ShowModal", (PyCFunction)_wrap_Dialog_ShowModal, METH_O, NULL},
         { (char *)"Dialog_CreateStdDialogButtonSizer", (PyCFunction) _wrap_Dialog_CreateStdDialogButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Dialog_IsModal", (PyCFunction)_wrap_Dialog_IsModal, METH_O, NULL},
         { (char *)"Dialog_ShowModal", (PyCFunction)_wrap_Dialog_ShowModal, METH_O, NULL},


@@ -31198,8 +32051,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"SashWindow_Create", (PyCFunction) _wrap_SashWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_SetSashVisible", (PyCFunction) _wrap_SashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_GetSashVisible", (PyCFunction) _wrap_SashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_Create", (PyCFunction) _wrap_SashWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_SetSashVisible", (PyCFunction) _wrap_SashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_GetSashVisible", (PyCFunction) _wrap_SashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"SashWindow_SetSashBorder", (PyCFunction) _wrap_SashWindow_SetSashBorder, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"SashWindow_HasBorder", (PyCFunction) _wrap_SashWindow_HasBorder, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"SashWindow_GetEdgeMargin", (PyCFunction) _wrap_SashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_GetDefaultBorderSize", (PyCFunction)_wrap_SashWindow_GetDefaultBorderSize, METH_O, NULL},
         { (char *)"SashWindow_GetEdgeMargin", (PyCFunction) _wrap_SashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"SashWindow_GetDefaultBorderSize", (PyCFunction)_wrap_SashWindow_GetDefaultBorderSize, METH_O, NULL},


@@ -31327,6 +32178,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"VListBox_SetMargins", (PyCFunction) _wrap_VListBox_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_SetMarginsXY", (PyCFunction) _wrap_VListBox_SetMarginsXY, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_SetSelectionBackground", (PyCFunction) _wrap_VListBox_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_SetMargins", (PyCFunction) _wrap_VListBox_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_SetMarginsXY", (PyCFunction) _wrap_VListBox_SetMarginsXY, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_SetSelectionBackground", (PyCFunction) _wrap_VListBox_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"VListBox_RefreshSelected", (PyCFunction)_wrap_VListBox_RefreshSelected, METH_O, NULL},

         { (char *)"VListBox_OnDrawSeparator", (PyCFunction) _wrap_VListBox_OnDrawSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_OnDrawBackground", (PyCFunction) _wrap_VListBox_OnDrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_swigregister", VListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"VListBox_OnDrawSeparator", (PyCFunction) _wrap_VListBox_OnDrawSeparator, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_OnDrawBackground", (PyCFunction) _wrap_VListBox_OnDrawBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"VListBox_swigregister", VListBox_swigregister, METH_VARARGS, NULL},


@@ -31340,6 +32192,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlListBox_OnLinkClicked", (PyCFunction) _wrap_HtmlListBox_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_OnLinkClicked", (PyCFunction) _wrap_HtmlListBox_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},

+        { (char *)"new_SimpleHtmlListBox", (PyCFunction) _wrap_new_SimpleHtmlListBox, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"new_PreSimpleHtmlListBox", (PyCFunction)_wrap_new_PreSimpleHtmlListBox, METH_NOARGS, NULL},
+        { (char *)"SimpleHtmlListBox_Create", (PyCFunction) _wrap_SimpleHtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"SimpleHtmlListBox_swigregister", SimpleHtmlListBox_swigregister, METH_VARARGS, NULL},
+        { (char *)"SimpleHtmlListBox_swiginit", SimpleHtmlListBox_swiginit, METH_VARARGS, NULL},

         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},
         { (char *)"delete_TaskBarIcon", (PyCFunction)_wrap_delete_TaskBarIcon, METH_O, NULL},
         { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},
         { (char *)"delete_TaskBarIcon", (PyCFunction)_wrap_delete_TaskBarIcon, METH_O, NULL},
         { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31443,6 +32300,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"MessageDialog_swiginit", MessageDialog_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MessageDialog_swiginit", MessageDialog_swiginit, METH_VARARGS, NULL},
         { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"ProgressDialog_Pulse", (PyCFunction) _wrap_ProgressDialog_Pulse, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"ProgressDialog_Resume", (PyCFunction)_wrap_ProgressDialog_Resume, METH_O, NULL},
         { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL},
         { (char *)"ProgressDialog_swiginit", ProgressDialog_swiginit, METH_VARARGS, NULL},
         { (char *)"ProgressDialog_Resume", (PyCFunction)_wrap_ProgressDialog_Resume, METH_O, NULL},
         { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL},
         { (char *)"ProgressDialog_swiginit", ProgressDialog_swiginit, METH_VARARGS, NULL},


@@ -31482,7 +32340,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},

-        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction)_wrap_MDIParentFrame_GetToolBar, METH_O, NULL},

         { (char *)"MDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_MDIParentFrame_GetWindowMenu, METH_O, NULL},
         { (char *)"MDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_MDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_MDIParentFrame_GetWindowMenu, METH_O, NULL},
         { (char *)"MDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_MDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31502,7 +32359,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_PyWindow", (PyCFunction) _wrap_new_PyWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyWindow", (PyCFunction)_wrap_new_PrePyWindow, METH_NOARGS, NULL},
         { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PyWindow", (PyCFunction) _wrap_new_PyWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyWindow", (PyCFunction)_wrap_new_PrePyWindow, METH_NOARGS, NULL},
         { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"PyWindow_SetBestSize", (PyCFunction) _wrap_PyWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PyWindow_DoEraseBackground", (PyCFunction) _wrap_PyWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoMoveWindow", (PyCFunction) _wrap_PyWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoSetSize", (PyCFunction) _wrap_PyWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoEraseBackground", (PyCFunction) _wrap_PyWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoMoveWindow", (PyCFunction) _wrap_PyWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyWindow_DoSetSize", (PyCFunction) _wrap_PyWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31520,7 +32376,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyPanel", (PyCFunction)_wrap_new_PrePyPanel, METH_NOARGS, NULL},
         { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyPanel", (PyCFunction)_wrap_new_PrePyPanel, METH_NOARGS, NULL},
         { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"PyPanel_SetBestSize", (PyCFunction) _wrap_PyPanel_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PyPanel_DoEraseBackground", (PyCFunction) _wrap_PyPanel_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoMoveWindow", (PyCFunction) _wrap_PyPanel_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoSetSize", (PyCFunction) _wrap_PyPanel_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoEraseBackground", (PyCFunction) _wrap_PyPanel_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoMoveWindow", (PyCFunction) _wrap_PyPanel_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyPanel_DoSetSize", (PyCFunction) _wrap_PyPanel_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31538,7 +32393,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyScrolledWindow", (PyCFunction)_wrap_new_PrePyScrolledWindow, METH_NOARGS, NULL},
         { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PrePyScrolledWindow", (PyCFunction)_wrap_new_PrePyScrolledWindow, METH_NOARGS, NULL},
         { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"PyScrolledWindow_SetBestSize", (PyCFunction) _wrap_PyScrolledWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PyScrolledWindow_DoEraseBackground", (PyCFunction) _wrap_PyScrolledWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoEraseBackground", (PyCFunction) _wrap_PyScrolledWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyScrolledWindow_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31558,7 +32412,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_GetNoCopies", (PyCFunction)_wrap_PrintData_GetNoCopies, METH_O, NULL},
         { (char *)"PrintData_GetCollate", (PyCFunction)_wrap_PrintData_GetCollate, METH_O, NULL},
         { (char *)"PrintData_GetOrientation", (PyCFunction)_wrap_PrintData_GetOrientation, METH_O, NULL},
         { (char *)"PrintData_GetNoCopies", (PyCFunction)_wrap_PrintData_GetNoCopies, METH_O, NULL},
         { (char *)"PrintData_GetCollate", (PyCFunction)_wrap_PrintData_GetCollate, METH_O, NULL},
         { (char *)"PrintData_GetOrientation", (PyCFunction)_wrap_PrintData_GetOrientation, METH_O, NULL},

-        { (char *)"PrintData_Ok", (PyCFunction)_wrap_PrintData_Ok, METH_O, NULL},
+        { (char *)"PrintData_IsOrientationReversed", (PyCFunction)_wrap_PrintData_IsOrientationReversed, METH_O, NULL},
+        { (char *)"PrintData_IsOk", (PyCFunction)_wrap_PrintData_IsOk, METH_O, NULL},

         { (char *)"PrintData_GetPrinterName", (PyCFunction)_wrap_PrintData_GetPrinterName, METH_O, NULL},
         { (char *)"PrintData_GetColour", (PyCFunction)_wrap_PrintData_GetColour, METH_O, NULL},
         { (char *)"PrintData_GetDuplex", (PyCFunction)_wrap_PrintData_GetDuplex, METH_O, NULL},
         { (char *)"PrintData_GetPrinterName", (PyCFunction)_wrap_PrintData_GetPrinterName, METH_O, NULL},
         { (char *)"PrintData_GetColour", (PyCFunction)_wrap_PrintData_GetColour, METH_O, NULL},
         { (char *)"PrintData_GetDuplex", (PyCFunction)_wrap_PrintData_GetDuplex, METH_O, NULL},


@@ -31567,9 +32422,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},
         { (char *)"PrintData_GetQuality", (PyCFunction)_wrap_PrintData_GetQuality, METH_O, NULL},
         { (char *)"PrintData_GetBin", (PyCFunction)_wrap_PrintData_GetBin, METH_O, NULL},
         { (char *)"PrintData_GetPrintMode", (PyCFunction)_wrap_PrintData_GetPrintMode, METH_O, NULL},

+        { (char *)"PrintData_GetMedia", (PyCFunction)_wrap_PrintData_GetMedia, METH_O, NULL},

         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"PrintData_SetOrientationReversed", (PyCFunction) _wrap_PrintData_SetOrientationReversed, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PrintData_SetPrinterName", (PyCFunction) _wrap_PrintData_SetPrinterName, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetColour", (PyCFunction) _wrap_PrintData_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetDuplex", (PyCFunction) _wrap_PrintData_SetDuplex, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrinterName", (PyCFunction) _wrap_PrintData_SetPrinterName, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetColour", (PyCFunction) _wrap_PrintData_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetDuplex", (PyCFunction) _wrap_PrintData_SetDuplex, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31578,6 +32435,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetBin", (PyCFunction) _wrap_PrintData_SetBin, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"PrintData_SetMedia", (PyCFunction) _wrap_PrintData_SetMedia, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},
         { (char *)"PrintData_GetFilename", (PyCFunction)_wrap_PrintData_GetFilename, METH_O, NULL},
         { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintData_GetPrivData", (PyCFunction)_wrap_PrintData_GetPrivData, METH_O, NULL},


@@ -31605,7 +32463,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PageSetupDialogData_GetPaperId", (PyCFunction)_wrap_PageSetupDialogData_GetPaperId, METH_O, NULL},
         { (char *)"PageSetupDialogData_GetPaperSize", (PyCFunction)_wrap_PageSetupDialogData_GetPaperSize, METH_O, NULL},
         { (char *)"PageSetupDialogData_GetPrintData", (PyCFunction)_wrap_PageSetupDialogData_GetPrintData, METH_O, NULL},
         { (char *)"PageSetupDialogData_GetPaperId", (PyCFunction)_wrap_PageSetupDialogData_GetPaperId, METH_O, NULL},
         { (char *)"PageSetupDialogData_GetPaperSize", (PyCFunction)_wrap_PageSetupDialogData_GetPaperSize, METH_O, NULL},
         { (char *)"PageSetupDialogData_GetPrintData", (PyCFunction)_wrap_PageSetupDialogData_GetPrintData, METH_O, NULL},

-        { (char *)"PageSetupDialogData_Ok", (PyCFunction)_wrap_PageSetupDialogData_Ok, METH_O, NULL},
+        { (char *)"PageSetupDialogData_IsOk", (PyCFunction)_wrap_PageSetupDialogData_IsOk, METH_O, NULL},

         { (char *)"PageSetupDialogData_SetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PageSetupDialogData_SetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PageSetupDialogData_SetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PageSetupDialogData_SetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PageSetupDialogData_SetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PageSetupDialogData_SetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31654,7 +32512,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintDialogData_GetEnableSelection", (PyCFunction)_wrap_PrintDialogData_GetEnableSelection, METH_O, NULL},
         { (char *)"PrintDialogData_GetEnablePageNumbers", (PyCFunction)_wrap_PrintDialogData_GetEnablePageNumbers, METH_O, NULL},
         { (char *)"PrintDialogData_GetEnableHelp", (PyCFunction)_wrap_PrintDialogData_GetEnableHelp, METH_O, NULL},
         { (char *)"PrintDialogData_GetEnableSelection", (PyCFunction)_wrap_PrintDialogData_GetEnableSelection, METH_O, NULL},
         { (char *)"PrintDialogData_GetEnablePageNumbers", (PyCFunction)_wrap_PrintDialogData_GetEnablePageNumbers, METH_O, NULL},
         { (char *)"PrintDialogData_GetEnableHelp", (PyCFunction)_wrap_PrintDialogData_GetEnableHelp, METH_O, NULL},

-        { (char *)"PrintDialogData_Ok", (PyCFunction)_wrap_PrintDialogData_Ok, METH_O, NULL},
+        { (char *)"PrintDialogData_IsOk", (PyCFunction)_wrap_PrintDialogData_IsOk, METH_O, NULL},

         { (char *)"PrintDialogData_GetPrintData", (PyCFunction)_wrap_PrintDialogData_GetPrintData, METH_O, NULL},
         { (char *)"PrintDialogData_SetPrintData", (PyCFunction) _wrap_PrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintDialogData_swigregister", PrintDialogData_swigregister, METH_VARARGS, NULL},
         { (char *)"PrintDialogData_GetPrintData", (PyCFunction)_wrap_PrintDialogData_GetPrintData, METH_O, NULL},
         { (char *)"PrintDialogData_SetPrintData", (PyCFunction) _wrap_PrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintDialogData_swigregister", PrintDialogData_swigregister, METH_VARARGS, NULL},


@@ -31685,6 +32543,18 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Printout_GetTitle", (PyCFunction)_wrap_Printout_GetTitle, METH_O, NULL},
         { (char *)"Printout_GetDC", (PyCFunction)_wrap_Printout_GetDC, METH_O, NULL},
         { (char *)"Printout_SetDC", (PyCFunction) _wrap_Printout_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_GetTitle", (PyCFunction)_wrap_Printout_GetTitle, METH_O, NULL},
         { (char *)"Printout_GetDC", (PyCFunction)_wrap_Printout_GetDC, METH_O, NULL},
         { (char *)"Printout_SetDC", (PyCFunction) _wrap_Printout_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"Printout_FitThisSizeToPaper", (PyCFunction) _wrap_Printout_FitThisSizeToPaper, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_FitThisSizeToPage", (PyCFunction) _wrap_Printout_FitThisSizeToPage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_FitThisSizeToPageMargins", (PyCFunction) _wrap_Printout_FitThisSizeToPageMargins, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_MapScreenSizeToPaper", (PyCFunction)_wrap_Printout_MapScreenSizeToPaper, METH_O, NULL},
+        { (char *)"Printout_MapScreenSizeToPage", (PyCFunction)_wrap_Printout_MapScreenSizeToPage, METH_O, NULL},
+        { (char *)"Printout_MapScreenSizeToPageMargins", (PyCFunction) _wrap_Printout_MapScreenSizeToPageMargins, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_MapScreenSizeToDevice", (PyCFunction)_wrap_Printout_MapScreenSizeToDevice, METH_O, NULL},
+        { (char *)"Printout_GetLogicalPaperRect", (PyCFunction)_wrap_Printout_GetLogicalPaperRect, METH_O, NULL},
+        { (char *)"Printout_GetLogicalPageRect", (PyCFunction)_wrap_Printout_GetLogicalPageRect, METH_O, NULL},
+        { (char *)"Printout_GetLogicalPageMarginsRect", (PyCFunction) _wrap_Printout_GetLogicalPageMarginsRect, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_SetLogicalOrigin", (PyCFunction) _wrap_Printout_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_OffsetLogicalOrigin", (PyCFunction) _wrap_Printout_OffsetLogicalOrigin, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"Printout_SetPageSizePixels", (PyCFunction) _wrap_Printout_SetPageSizePixels, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_GetPageSizePixels", (PyCFunction)_wrap_Printout_GetPageSizePixels, METH_O, NULL},
         { (char *)"Printout_SetPageSizeMM", (PyCFunction) _wrap_Printout_SetPageSizeMM, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_SetPageSizePixels", (PyCFunction) _wrap_Printout_SetPageSizePixels, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_GetPageSizePixels", (PyCFunction)_wrap_Printout_GetPageSizePixels, METH_O, NULL},
         { (char *)"Printout_SetPageSizeMM", (PyCFunction) _wrap_Printout_SetPageSizeMM, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31693,6 +32563,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"Printout_GetPPIScreen", (PyCFunction)_wrap_Printout_GetPPIScreen, METH_O, NULL},
         { (char *)"Printout_SetPPIPrinter", (PyCFunction) _wrap_Printout_SetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_GetPPIPrinter", (PyCFunction)_wrap_Printout_GetPPIPrinter, METH_O, NULL},
         { (char *)"Printout_GetPPIScreen", (PyCFunction)_wrap_Printout_GetPPIScreen, METH_O, NULL},
         { (char *)"Printout_SetPPIPrinter", (PyCFunction) _wrap_Printout_SetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_GetPPIPrinter", (PyCFunction)_wrap_Printout_GetPPIPrinter, METH_O, NULL},

+        { (char *)"Printout_SetPaperRectPixels", (PyCFunction) _wrap_Printout_SetPaperRectPixels, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"Printout_GetPaperRectPixels", (PyCFunction)_wrap_Printout_GetPaperRectPixels, METH_O, NULL},

         { (char *)"Printout_IsPreview", (PyCFunction)_wrap_Printout_IsPreview, METH_O, NULL},
         { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_OnBeginDocument", (PyCFunction) _wrap_Printout_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_IsPreview", (PyCFunction)_wrap_Printout_IsPreview, METH_O, NULL},
         { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"Printout_OnBeginDocument", (PyCFunction) _wrap_Printout_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -31745,7 +32617,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PrintPreview_GetZoom", (PyCFunction)_wrap_PrintPreview_GetZoom, METH_O, NULL},
         { (char *)"PrintPreview_GetMaxPage", (PyCFunction)_wrap_PrintPreview_GetMaxPage, METH_O, NULL},
         { (char *)"PrintPreview_GetMinPage", (PyCFunction)_wrap_PrintPreview_GetMinPage, METH_O, NULL},
         { (char *)"PrintPreview_GetZoom", (PyCFunction)_wrap_PrintPreview_GetZoom, METH_O, NULL},
         { (char *)"PrintPreview_GetMaxPage", (PyCFunction)_wrap_PrintPreview_GetMaxPage, METH_O, NULL},
         { (char *)"PrintPreview_GetMinPage", (PyCFunction)_wrap_PrintPreview_GetMinPage, METH_O, NULL},

-        { (char *)"PrintPreview_Ok", (PyCFunction)_wrap_PrintPreview_Ok, METH_O, NULL},
+        { (char *)"PrintPreview_IsOk", (PyCFunction)_wrap_PrintPreview_IsOk, METH_O, NULL},

         { (char *)"PrintPreview_SetOk", (PyCFunction) _wrap_PrintPreview_SetOk, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintPreview_Print", (PyCFunction) _wrap_PrintPreview_Print, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintPreview_DetermineScaling", (PyCFunction)_wrap_PrintPreview_DetermineScaling, METH_O, NULL},
         { (char *)"PrintPreview_SetOk", (PyCFunction) _wrap_PrintPreview_SetOk, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintPreview_Print", (PyCFunction) _wrap_PrintPreview_Print, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PrintPreview_DetermineScaling", (PyCFunction)_wrap_PrintPreview_DetermineScaling, METH_O, NULL},


@@ -31912,6 +32784,12 @@ static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) {
 static void *_p_wxTaskBarIconEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxTaskBarIconEvent *) x));
 }
 static void *_p_wxTaskBarIconEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxTaskBarIconEvent *) x));
 }

+static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
+    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxSimpleHtmlListBoxTo_p_wxItemContainer(void *x) {
+    return (void *)((wxItemContainer *)  ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxSplitterEventTo_p_wxNotifyEvent(void *x) {
     return (void *)((wxNotifyEvent *)  ((wxSplitterEvent *) x));
 }
 static void *_p_wxSplitterEventTo_p_wxNotifyEvent(void *x) {
     return (void *)((wxNotifyEvent *)  ((wxSplitterEvent *) x));
 }


@@ -31924,6 +32802,9 @@ static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMiniFrameTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x));
 }
 static void *_p_wxMiniFrameTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x));
 }

+static void *_p_wxEventBlockerTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxEventBlocker *) x));
+}

 static void *_p_wxPyPanelTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyPanel *) x));
 }
 static void *_p_wxPyPanelTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyPanel *) x));
 }


@@ -31939,12 +32820,6 @@ static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
 static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *)  ((wxMenu *) x));
 }
 static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *)  ((wxMenu *) x));
 }

-static void *_p_wxPasswordEntryDialogTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
-}
-static void *_p_wxTextEntryDialogTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x));
-}

 static void *_p_wxSingleChoiceDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x));
 }
 static void *_p_wxSingleChoiceDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x));
 }


@@ -31954,6 +32829,12 @@ static void *_p_wxMultiChoiceDialogTo_p_wxEvtHandler(void *x) {
 static void *_p_wxFileDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x));
 }
 static void *_p_wxFileDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x));
 }

+static void *_p_wxTextEntryDialogTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x));
+}
+static void *_p_wxPasswordEntryDialogTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x));
+}

 static void *_p_wxNumberEntryDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxNumberEntryDialog *) x));
 }
 static void *_p_wxNumberEntryDialogTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxNumberEntryDialog *) x));
 }


@@ -32035,6 +32916,9 @@ static void *_p_wxPyWindowTo_p_wxEvtHandler(void *x) {
 static void *_p_wxPreviewCanvasTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x));
 }
 static void *_p_wxPreviewCanvasTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x));
 }

+static void *_p_wxSimpleHtmlListBoxTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *)(wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxPyHtmlListBoxTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxEvtHandler(void *x) {
     return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }


@@ -32071,6 +32955,12 @@ static void *_p_wxMDIParentFrameTo_p_wxEvtHandler(void *x) {
 static void *_p_wxPyHtmlListBoxTo_p_wxPyVListBox(void *x) {
     return (void *)((wxPyVListBox *)  ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxPyVListBox(void *x) {
     return (void *)((wxPyVListBox *)  ((wxPyHtmlListBox *) x));
 }

+static void *_p_wxSimpleHtmlListBoxTo_p_wxPyVListBox(void *x) {
+    return (void *)((wxPyVListBox *) (wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));
+}
+static void *_p_wxSimpleHtmlListBoxTo_p_wxPyHtmlListBox(void *x) {
+    return (void *)((wxPyHtmlListBox *)  ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxMDIChildFrameTo_p_wxFrame(void *x) {
     return (void *)((wxFrame *)  ((wxMDIChildFrame *) x));
 }
 static void *_p_wxMDIChildFrameTo_p_wxFrame(void *x) {
     return (void *)((wxFrame *)  ((wxMDIChildFrame *) x));
 }


@@ -32098,6 +32988,9 @@ static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
 static void *_p_wxQueryLayoutInfoEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxQueryLayoutInfoEvent *) x));
 }
 static void *_p_wxQueryLayoutInfoEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxQueryLayoutInfoEvent *) x));
 }

+static void *_p_wxEventBlockerTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *) ((wxEventBlocker *) x));
+}

 static void *_p_wxPreviewFrameTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x));
 }
 static void *_p_wxPreviewFrameTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x));
 }


@@ -32143,12 +33036,12 @@ static void *_p_wxFontDataTo_p_wxObject(void *x) {
 static void *_p_wxPrintDataTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxPrintData *) x));
 }
 static void *_p_wxPrintDataTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxPrintData *) x));
 }

-static void *_p_wxFlexGridSizerTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxSizer *)(wxGridSizer *) ((wxFlexGridSizer *) x));
-}

 static void *_p_wxGridSizerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x));
 }
 static void *_p_wxGridSizerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x));
 }

+static void *_p_wxFlexGridSizerTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxSizer *)(wxGridSizer *) ((wxFlexGridSizer *) x));
+}

 static void *_p_wxInitDialogEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxInitDialogEvent *) x));
 }
 static void *_p_wxInitDialogEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxInitDialogEvent *) x));
 }


@@ -32323,6 +33216,9 @@ static void *_p_wxXPMHandlerTo_p_wxObject(void *x) {
 static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxTIFFHandler *) x));
 }
 static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxImageHandler *) ((wxTIFFHandler *) x));
 }

+static void *_p_wxTGAHandlerTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxImageHandler *) ((wxTGAHandler *) x));
+}

 static void *_p_wxEvtHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxEvtHandler *) x));
 }
 static void *_p_wxEvtHandlerTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxEvtHandler *) x));
 }


@@ -32338,12 +33234,15 @@ static void *_p_wxPyVListBoxTo_p_wxObject(void *x) {
 static void *_p_wxPyHtmlListBoxTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }

-static void *_p_wxStdDialogButtonSizerTo_p_wxObject(void *x) {
-    return (void *)((wxObject *) (wxSizer *)(wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+static void *_p_wxSimpleHtmlListBoxTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *)(wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));

 }
 static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxAcceleratorTable *) x));
 }
 }
 static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxAcceleratorTable *) x));
 }

+static void *_p_wxStdDialogButtonSizerTo_p_wxObject(void *x) {
+    return (void *)((wxObject *) (wxSizer *)(wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+}

 static void *_p_wxMiniFrameTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x));
 }
 static void *_p_wxMiniFrameTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x));
 }


@@ -32515,6 +33414,9 @@ static void *_p_wxPyVListBoxTo_p_wxPyVScrolledWindow(void *x) {
 static void *_p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow(void *x) {
     return (void *)((wxPyVScrolledWindow *) (wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow(void *x) {
     return (void *)((wxPyVScrolledWindow *) (wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }

+static void *_p_wxSimpleHtmlListBoxTo_p_wxPyVScrolledWindow(void *x) {
+    return (void *)((wxPyVScrolledWindow *) (wxPyVListBox *)(wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxTipWindowTo_p_wxPyPopupTransientWindow(void *x) {
     return (void *)((wxPyPopupTransientWindow *)  ((wxTipWindow *) x));
 }
 static void *_p_wxTipWindowTo_p_wxPyPopupTransientWindow(void *x) {
     return (void *)((wxPyPopupTransientWindow *)  ((wxTipWindow *) x));
 }


@@ -32689,6 +33591,9 @@ static void *_p_wxPyWindowTo_p_wxWindow(void *x) {
 static void *_p_wxPreviewCanvasTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x));
 }
 static void *_p_wxPreviewCanvasTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x));
 }

+static void *_p_wxSimpleHtmlListBoxTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *)(wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxPyHtmlListBoxTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }


@@ -32776,6 +33681,9 @@ static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) {
 static void *_p_wxPyHtmlListBoxTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }
 static void *_p_wxPyHtmlListBoxTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *) (wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
 }

+static void *_p_wxSimpleHtmlListBoxTo_p_wxPanel(void *x) {
+    return (void *)((wxPanel *) (wxPyVScrolledWindow *)(wxPyVListBox *)(wxPyHtmlListBox *) ((wxSimpleHtmlListBox *) x));
+}

 static void *_p_wxPyPanelTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *)  ((wxPyPanel *) x));
 }
 static void *_p_wxPyPanelTo_p_wxPanel(void *x) {
     return (void *)((wxPanel *)  ((wxPyPanel *) x));
 }


@@ -32830,6 +33738,9 @@ static void *_p_wxSashEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxPyPreviewControlBarTo_p_wxPreviewControlBar(void *x) {
     return (void *)((wxPreviewControlBar *)  ((wxPyPreviewControlBar *) x));
 }
 static void *_p_wxPyPreviewControlBarTo_p_wxPreviewControlBar(void *x) {
     return (void *)((wxPreviewControlBar *)  ((wxPyPreviewControlBar *) x));
 }

+static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
+    return (void *)((wxValidator *)  ((wxPyValidator *) x));
+}

 static swig_type_info _swigt__p_bool = {"_p_bool", "bool *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_bool = {"_p_bool", "bool *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};


@@ -32838,6 +33749,7 @@ static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned c
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxArrayInt = {"_p_wxArrayInt", "wxArrayInt *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxArrayInt = {"_p_wxArrayInt", "wxArrayInt *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxArrayString = {"_p_wxArrayString", "wxArrayString *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxCalculateLayoutEvent = {"_p_wxCalculateLayoutEvent", "wxCalculateLayoutEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxCalculateLayoutEvent = {"_p_wxCalculateLayoutEvent", "wxCalculateLayoutEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};


@@ -32885,7 +33797,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxEvtHandler = {"_p_wxEvtHandler", "wxEvtHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxEvtHandler = {"_p_wxEvtHandler", "wxEvtHandler *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxValidator = {"_p_wxValidator", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_wxEventBlocker = {"_p_wxEventBlocker", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxPyValidator = {"_p_wxPyValidator", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxControl = {"_p_wxControl", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPyApp = {"_p_wxPyApp", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPyValidator = {"_p_wxPyValidator", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxControl = {"_p_wxControl", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPyApp = {"_p_wxPyApp", 0, 0, 0, 0, 0};


@@ -32902,6 +33814,7 @@ static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (voi
 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxItemContainer = {"_p_wxItemContainer", "wxItemContainer *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMDIChildFrame = {"_p_wxMDIChildFrame", "wxMDIChildFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMDIClientWindow = {"_p_wxMDIClientWindow", "wxMDIClientWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMDIChildFrame = {"_p_wxMDIChildFrame", "wxMDIChildFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMDIClientWindow = {"_p_wxMDIClientWindow", "wxMDIClientWindow *", 0, 0, (void*)0, 0};


@@ -32922,12 +33835,11 @@ static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", 0, 0,
 static swig_type_info _swigt__p_wxBoxSizer = {"_p_wxBoxSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxGridBagSizer = {"_p_wxGridBagSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxBoxSizer = {"_p_wxBoxSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxGridBagSizer = {"_p_wxGridBagSizer", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxFSFile = {"_p_wxFSFile", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPySizer = {"_p_wxPySizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxFSFile = {"_p_wxFSFile", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPySizer = {"_p_wxPySizer", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0};

-static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxICOHandler = {"_p_wxICOHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxICOHandler = {"_p_wxICOHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0, 0};


@@ -32936,10 +33848,12 @@ static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0, 0
 static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, 0};

+static swig_type_info _swigt__p_wxTGAHandler = {"_p_wxTGAHandler", 0, 0, 0, 0, 0};

 static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxImage = {"_p_wxImage", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPageSetupDialog = {"_p_wxPageSetupDialog", "wxPageSetupDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxImage = {"_p_wxImage", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_wxPageSetupDialog = {"_p_wxPageSetupDialog", "wxPageSetupDialog *", 0, 0, (void*)0, 0};


@@ -32978,6 +33892,7 @@ static swig_type_info _swigt__p_wxSashLayoutWindow = {"_p_wxSashLayoutWindow", "
 static swig_type_info _swigt__p_wxSashWindow = {"_p_wxSashWindow", "wxSashWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxScrollWinEvent = {"_p_wxScrollWinEvent", "wxScrollWinEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxScrolledWindow = {"_p_wxScrolledWindow", "wxScrolledWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSashWindow = {"_p_wxSashWindow", "wxSashWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxScrollWinEvent = {"_p_wxScrollWinEvent", "wxScrollWinEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxScrolledWindow = {"_p_wxScrolledWindow", "wxScrolledWindow *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxSimpleHtmlListBox = {"_p_wxSimpleHtmlListBox", "wxSimpleHtmlListBox *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxSingleChoiceDialog = {"_p_wxSingleChoiceDialog", "wxSingleChoiceDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSplashScreen = {"_p_wxSplashScreen", "wxSplashScreen *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSingleChoiceDialog = {"_p_wxSingleChoiceDialog", "wxSingleChoiceDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSplashScreen = {"_p_wxSplashScreen", "wxSplashScreen *", 0, 0, (void*)0, 0};


@@ -32993,6 +33908,7 @@ static swig_type_info _swigt__p_wxTextEntryDialog = {"_p_wxTextEntryDialog", "wx
 static swig_type_info _swigt__p_wxTipWindow = {"_p_wxTipWindow", "wxTipWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", "wxToolBar *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", "wxTopLevelWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxTipWindow = {"_p_wxTipWindow", "wxTipWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", "wxToolBar *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", "wxTopLevelWindow *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxValidator = {"_p_wxValidator", "wxValidator *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, (void*)0, 0};
 
 static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, (void*)0, 0};
 


@@ -33008,6 +33924,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxAcceleratorTable,
   &_swigt__p_wxActivateEvent,
   &_swigt__p_wxArrayInt,
   &_swigt__p_wxAcceleratorTable,
   &_swigt__p_wxActivateEvent,
   &_swigt__p_wxArrayInt,

+  &_swigt__p_wxArrayString,

   &_swigt__p_wxBMPHandler,
   &_swigt__p_wxBitmap,
   &_swigt__p_wxBoxSizer,
   &_swigt__p_wxBMPHandler,
   &_swigt__p_wxBitmap,
   &_swigt__p_wxBoxSizer,


@@ -33032,6 +33949,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxDuplexMode,
   &_swigt__p_wxEraseEvent,
   &_swigt__p_wxEvent,
   &_swigt__p_wxDuplexMode,
   &_swigt__p_wxEraseEvent,
   &_swigt__p_wxEvent,

+  &_swigt__p_wxEventBlocker,

   &_swigt__p_wxEvtHandler,
   &_swigt__p_wxFSFile,
   &_swigt__p_wxFileDialog,
   &_swigt__p_wxEvtHandler,
   &_swigt__p_wxFSFile,
   &_swigt__p_wxFileDialog,


@@ -33059,6 +33977,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxImageHandler,
   &_swigt__p_wxIndividualLayoutConstraint,
   &_swigt__p_wxInitDialogEvent,
   &_swigt__p_wxImageHandler,
   &_swigt__p_wxIndividualLayoutConstraint,
   &_swigt__p_wxInitDialogEvent,

+  &_swigt__p_wxItemContainer,

   &_swigt__p_wxJPEGHandler,
   &_swigt__p_wxKeyEvent,
   &_swigt__p_wxLayoutAlgorithm,
   &_swigt__p_wxJPEGHandler,
   &_swigt__p_wxKeyEvent,
   &_swigt__p_wxLayoutAlgorithm,


@@ -33134,6 +34053,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxScrolledWindow,
   &_swigt__p_wxSetCursorEvent,
   &_swigt__p_wxShowEvent,
   &_swigt__p_wxScrolledWindow,
   &_swigt__p_wxSetCursorEvent,
   &_swigt__p_wxShowEvent,

+  &_swigt__p_wxSimpleHtmlListBox,

   &_swigt__p_wxSingleChoiceDialog,
   &_swigt__p_wxSize,
   &_swigt__p_wxSizeEvent,
   &_swigt__p_wxSingleChoiceDialog,
   &_swigt__p_wxSize,
   &_swigt__p_wxSizeEvent,


@@ -33148,6 +34068,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxStdDialogButtonSizer,
   &_swigt__p_wxString,
   &_swigt__p_wxSysColourChangedEvent,
   &_swigt__p_wxStdDialogButtonSizer,
   &_swigt__p_wxString,
   &_swigt__p_wxSysColourChangedEvent,

+  &_swigt__p_wxTGAHandler,

   &_swigt__p_wxTIFFHandler,
   &_swigt__p_wxTaskBarIcon,
   &_swigt__p_wxTaskBarIconEvent,
   &_swigt__p_wxTIFFHandler,
   &_swigt__p_wxTaskBarIcon,
   &_swigt__p_wxTaskBarIconEvent,


@@ -33172,6 +34093,7 @@ static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char,
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxArrayInt[] = {  {&_swigt__p_wxArrayInt, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxArrayInt[] = {  {&_swigt__p_wxArrayInt, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxArrayString[] = {  {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCalculateLayoutEvent[] = {  {&_swigt__p_wxCalculateLayoutEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCalculateLayoutEvent[] = {  {&_swigt__p_wxCalculateLayoutEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};


@@ -33218,12 +34140,12 @@ static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0,
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxEvent[] = {  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxEvent, 0, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxValidator[] = {{&_swigt__p_wxValidator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxEventBlocker[] = {{&_swigt__p_wxEventBlocker, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControl[] = {{&_swigt__p_wxControl, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControl[] = {{&_swigt__p_wxControl, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxEvtHandler[] = {  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxEvtHandler, 0, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxEvtHandler[] = {  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxEventBlocker, _p_wxEventBlockerTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxEvtHandler, 0, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFileDialog[] = {  {&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFileSystem[] = {  {&_swigt__p_wxFileSystem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {  {&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFileDialog[] = {  {&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFileSystem[] = {  {&_swigt__p_wxFileSystem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFindDialogEvent[] = {  {&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -33236,6 +34158,7 @@ static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_w
 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxItemContainer[] = {  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxItemContainer, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxItemContainer, 0, 0},  {&_swigt__p_wxItemContainer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMDIChildFrame[] = {  {&_swigt__p_wxMDIChildFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMDIClientWindow[] = {  {&_swigt__p_wxMDIClientWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMDIChildFrame[] = {  {&_swigt__p_wxMDIChildFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMDIClientWindow[] = {  {&_swigt__p_wxMDIClientWindow, 0, 0, 0},{0, 0, 0, 0}};


@@ -33255,12 +34178,11 @@ static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {{&_swigt__p_wxStaticBoxSiz
 static swig_cast_info _swigc__p_wxBoxSizer[] = {{&_swigt__p_wxBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizer[] = {{&_swigt__p_wxSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGridBagSizer[] = {{&_swigt__p_wxGridBagSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBoxSizer[] = {{&_swigt__p_wxBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizer[] = {{&_swigt__p_wxSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxGridBagSizer[] = {{&_swigt__p_wxGridBagSizer, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxFSFile[] = {{&_swigt__p_wxFSFile, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPySizer[] = {{&_swigt__p_wxPySizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFSFile[] = {{&_swigt__p_wxFSFile, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPySizer[] = {{&_swigt__p_wxPySizer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxICOHandler[] = {{&_swigt__p_wxICOHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxICOHandler[] = {{&_swigt__p_wxICOHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}};


@@ -33269,16 +34191,18 @@ static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0
 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxTGAHandler[] = {{&_swigt__p_wxTGAHandler, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxObject[] = {  {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxEventBlocker, _p_wxEventBlockerTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0},  {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0},  {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0},  {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0},  {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0},  {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxTGAHandler, _p_wxTGAHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxObject, 0, 0},  {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0},  {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0},  {&_swigt__p_wxObject, 0, 0, 0},  {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0},  {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0},  {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0},  {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0},  {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0},  {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0},  {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPageSetupDialog[] = {  {&_swigt__p_wxPageSetupDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPageSetupDialog[] = {  {&_swigt__p_wxPageSetupDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPageSetupDialogData[] = {  {&_swigt__p_wxPageSetupDialogData, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxPanel[] = {  {&_swigt__p_wxPanel, 0, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPasswordEntryDialog[] = {  {&_swigt__p_wxPasswordEntryDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPoint[] = {  {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPaperSize[] = {  {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPasswordEntryDialog[] = {  {&_swigt__p_wxPasswordEntryDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPoint[] = {  {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};


@@ -33292,7 +34216,7 @@ static swig_cast_info _swigc__p_wxPrintDialogData[] = {  {&_swigt__p_wxPrintDial
 static swig_cast_info _swigc__p_wxPrintPreview[] = {  {&_swigt__p_wxPrintPreview, 0, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxPrintPreview, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {  {&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxProgressDialog[] = {  {&_swigt__p_wxProgressDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrintPreview[] = {  {&_swigt__p_wxPrintPreview, 0, 0, 0},  {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxPrintPreview, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPrinter[] = {  {&_swigt__p_wxPrinter, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxProgressDialog[] = {  {&_swigt__p_wxProgressDialog, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxPyHtmlListBox[] = {  {&_swigt__p_wxPyHtmlListBox, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxPyHtmlListBox[] = {  {&_swigt__p_wxPyHtmlListBox, 0, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxPyHtmlListBox, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPyPanel[] = {  {&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPopupTransientWindow[] = {  {&_swigt__p_wxPyPopupTransientWindow, 0, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxPyPopupTransientWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPreviewControlBar[] = {  {&_swigt__p_wxPyPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPanel[] = {  {&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPopupTransientWindow[] = {  {&_swigt__p_wxPyPopupTransientWindow, 0, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxPyPopupTransientWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPreviewControlBar[] = {  {&_swigt__p_wxPyPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}};


@@ -33301,8 +34225,8 @@ static swig_cast_info _swigc__p_wxPyPrintPreview[] = {  {&_swigt__p_wxPyPrintPre
 static swig_cast_info _swigc__p_wxPyPrintout[] = {  {&_swigt__p_wxPyPrintout, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyScrolledWindow[] = {  {&_swigt__p_wxPyScrolledWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyTaskBarIcon[] = {  {&_swigt__p_wxPyTaskBarIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyPrintout[] = {  {&_swigt__p_wxPyPrintout, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyScrolledWindow[] = {  {&_swigt__p_wxPyScrolledWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyTaskBarIcon[] = {  {&_swigt__p_wxPyTaskBarIcon, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxPyVListBox[] = {  {&_swigt__p_wxPyVListBox, 0, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPyVListBox, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_wxPyVScrolledWindow[] = {  {&_swigt__p_wxPyVScrolledWindow, 0, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPyVScrolledWindow, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxPyVListBox[] = {  {&_swigt__p_wxPyVListBox, 0, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPyVListBox, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxPyVListBox, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxPyVScrolledWindow[] = {  {&_swigt__p_wxPyVScrolledWindow, 0, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPyVScrolledWindow, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPyVScrolledWindow, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxPyVScrolledWindow, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxPyWindow[] = {  {&_swigt__p_wxPyWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {  {&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRect[] = {  {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxPyWindow[] = {  {&_swigt__p_wxPyWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxQueryLayoutInfoEvent[] = {  {&_swigt__p_wxQueryLayoutInfoEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxRect[] = {  {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};


@@ -33312,6 +34236,7 @@ static swig_cast_info _swigc__p_wxSashLayoutWindow[] = {  {&_swigt__p_wxSashLayo
 static swig_cast_info _swigc__p_wxSashWindow[] = {  {&_swigt__p_wxSashWindow, 0, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxSashWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrollWinEvent[] = {  {&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrolledWindow[] = {  {&_swigt__p_wxScrolledWindow, 0, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSashWindow[] = {  {&_swigt__p_wxSashWindow, 0, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxSashWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrollWinEvent[] = {  {&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxScrolledWindow[] = {  {&_swigt__p_wxScrolledWindow, 0, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxScrolledWindow, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxSimpleHtmlListBox[] = {  {&_swigt__p_wxSimpleHtmlListBox, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxSingleChoiceDialog[] = {  {&_swigt__p_wxSingleChoiceDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSize[] = {  {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSplashScreen[] = {  {&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSingleChoiceDialog[] = {  {&_swigt__p_wxSingleChoiceDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSize[] = {  {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSplashScreen[] = {  {&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}};


@@ -33327,8 +34252,9 @@ static swig_cast_info _swigc__p_wxTextEntryDialog[] = {  {&_swigt__p_wxTextEntry
 static swig_cast_info _swigc__p_wxTipWindow[] = {  {&_swigt__p_wxTipWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxToolBar[] = {  {&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxTopLevelWindow[] = {  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxTopLevelWindow, 0, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxTopLevelWindow, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxTipWindow[] = {  {&_swigt__p_wxTipWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxToolBar[] = {  {&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxTopLevelWindow[] = {  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxTopLevelWindow, 0, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxTopLevelWindow, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxTopLevelWindow, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxValidator[] = {  {&_swigt__p_wxValidator, 0, 0, 0},  {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxVisualAttributes[] = {  {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxVisualAttributes[] = {  {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxWindow[] = {  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxWindow, 0, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxWindow[] = {  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0},  {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxWindow, 0, 0, 0},  {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0},  {&_swigt__p_wxSimpleHtmlListBox, _p_wxSimpleHtmlListBoxTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0},  {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0},{0, 0, 0, 0}};

 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_bool,
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_bool,


@@ -33342,6 +34268,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxAcceleratorTable,
   _swigc__p_wxActivateEvent,
   _swigc__p_wxArrayInt,
   _swigc__p_wxAcceleratorTable,
   _swigc__p_wxActivateEvent,
   _swigc__p_wxArrayInt,

+  _swigc__p_wxArrayString,

   _swigc__p_wxBMPHandler,
   _swigc__p_wxBitmap,
   _swigc__p_wxBoxSizer,
   _swigc__p_wxBMPHandler,
   _swigc__p_wxBitmap,
   _swigc__p_wxBoxSizer,


@@ -33366,6 +34293,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxDuplexMode,
   _swigc__p_wxEraseEvent,
   _swigc__p_wxEvent,
   _swigc__p_wxDuplexMode,
   _swigc__p_wxEraseEvent,
   _swigc__p_wxEvent,

+  _swigc__p_wxEventBlocker,

   _swigc__p_wxEvtHandler,
   _swigc__p_wxFSFile,
   _swigc__p_wxFileDialog,
   _swigc__p_wxEvtHandler,
   _swigc__p_wxFSFile,
   _swigc__p_wxFileDialog,


@@ -33393,6 +34321,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxImageHandler,
   _swigc__p_wxIndividualLayoutConstraint,
   _swigc__p_wxInitDialogEvent,
   _swigc__p_wxImageHandler,
   _swigc__p_wxIndividualLayoutConstraint,
   _swigc__p_wxInitDialogEvent,

+  _swigc__p_wxItemContainer,

   _swigc__p_wxJPEGHandler,
   _swigc__p_wxKeyEvent,
   _swigc__p_wxLayoutAlgorithm,
   _swigc__p_wxJPEGHandler,
   _swigc__p_wxKeyEvent,
   _swigc__p_wxLayoutAlgorithm,


@@ -33468,6 +34397,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxScrolledWindow,
   _swigc__p_wxSetCursorEvent,
   _swigc__p_wxShowEvent,
   _swigc__p_wxScrolledWindow,
   _swigc__p_wxSetCursorEvent,
   _swigc__p_wxShowEvent,

+  _swigc__p_wxSimpleHtmlListBox,

   _swigc__p_wxSingleChoiceDialog,
   _swigc__p_wxSize,
   _swigc__p_wxSizeEvent,
   _swigc__p_wxSingleChoiceDialog,
   _swigc__p_wxSize,
   _swigc__p_wxSizeEvent,


@@ -33482,6 +34412,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxStdDialogButtonSizer,
   _swigc__p_wxString,
   _swigc__p_wxSysColourChangedEvent,
   _swigc__p_wxStdDialogButtonSizer,
   _swigc__p_wxString,
   _swigc__p_wxSysColourChangedEvent,

+  _swigc__p_wxTGAHandler,

   _swigc__p_wxTIFFHandler,
   _swigc__p_wxTaskBarIcon,
   _swigc__p_wxTaskBarIconEvent,
   _swigc__p_wxTIFFHandler,
   _swigc__p_wxTaskBarIcon,
   _swigc__p_wxTaskBarIconEvent,


@@ -34009,13 +34940,11 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "MINIMIZE",SWIG_From_int(static_cast< int >(wxMINIMIZE)));
   SWIG_Python_SetConstant(d, "MAXIMIZE",SWIG_From_int(static_cast< int >(wxMAXIMIZE)));
   SWIG_Python_SetConstant(d, "CLOSE_BOX",SWIG_From_int(static_cast< int >(wxCLOSE_BOX)));
   SWIG_Python_SetConstant(d, "MINIMIZE",SWIG_From_int(static_cast< int >(wxMINIMIZE)));
   SWIG_Python_SetConstant(d, "MAXIMIZE",SWIG_From_int(static_cast< int >(wxMAXIMIZE)));
   SWIG_Python_SetConstant(d, "CLOSE_BOX",SWIG_From_int(static_cast< int >(wxCLOSE_BOX)));

-  SWIG_Python_SetConstant(d, "THICK_FRAME",SWIG_From_int(static_cast< int >(wxTHICK_FRAME)));

   SWIG_Python_SetConstant(d, "SYSTEM_MENU",SWIG_From_int(static_cast< int >(wxSYSTEM_MENU)));
   SWIG_Python_SetConstant(d, "MINIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMINIMIZE_BOX)));
   SWIG_Python_SetConstant(d, "MAXIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMAXIMIZE_BOX)));
   SWIG_Python_SetConstant(d, "TINY_CAPTION_HORIZ",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_HORIZ)));
   SWIG_Python_SetConstant(d, "TINY_CAPTION_VERT",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_VERT)));
   SWIG_Python_SetConstant(d, "SYSTEM_MENU",SWIG_From_int(static_cast< int >(wxSYSTEM_MENU)));
   SWIG_Python_SetConstant(d, "MINIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMINIMIZE_BOX)));
   SWIG_Python_SetConstant(d, "MAXIMIZE_BOX",SWIG_From_int(static_cast< int >(wxMAXIMIZE_BOX)));
   SWIG_Python_SetConstant(d, "TINY_CAPTION_HORIZ",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_HORIZ)));
   SWIG_Python_SetConstant(d, "TINY_CAPTION_VERT",SWIG_From_int(static_cast< int >(wxTINY_CAPTION_VERT)));

-  SWIG_Python_SetConstant(d, "RESIZE_BOX",SWIG_From_int(static_cast< int >(wxRESIZE_BOX)));

   SWIG_Python_SetConstant(d, "RESIZE_BORDER",SWIG_From_int(static_cast< int >(wxRESIZE_BORDER)));
   SWIG_Python_SetConstant(d, "DIALOG_NO_PARENT",SWIG_From_int(static_cast< int >(wxDIALOG_NO_PARENT)));
   SWIG_Python_SetConstant(d, "DEFAULT_FRAME_STYLE",SWIG_From_int(static_cast< int >(wxDEFAULT_FRAME_STYLE)));
   SWIG_Python_SetConstant(d, "RESIZE_BORDER",SWIG_From_int(static_cast< int >(wxRESIZE_BORDER)));
   SWIG_Python_SetConstant(d, "DIALOG_NO_PARENT",SWIG_From_int(static_cast< int >(wxDIALOG_NO_PARENT)));
   SWIG_Python_SetConstant(d, "DEFAULT_FRAME_STYLE",SWIG_From_int(static_cast< int >(wxDEFAULT_FRAME_STYLE)));


@@ -34029,10 +34958,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "FRAME_EX_METAL",SWIG_From_int(static_cast< int >(wxFRAME_EX_METAL)));
   SWIG_Python_SetConstant(d, "DIALOG_EX_METAL",SWIG_From_int(static_cast< int >(wxDIALOG_EX_METAL)));
   SWIG_Python_SetConstant(d, "WS_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxWS_EX_CONTEXTHELP)));
   SWIG_Python_SetConstant(d, "FRAME_EX_METAL",SWIG_From_int(static_cast< int >(wxFRAME_EX_METAL)));
   SWIG_Python_SetConstant(d, "DIALOG_EX_METAL",SWIG_From_int(static_cast< int >(wxDIALOG_EX_METAL)));
   SWIG_Python_SetConstant(d, "WS_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxWS_EX_CONTEXTHELP)));

-  SWIG_Python_SetConstant(d, "DIALOG_MODAL",SWIG_From_int(static_cast< int >(wxDIALOG_MODAL)));
-  SWIG_Python_SetConstant(d, "DIALOG_MODELESS",SWIG_From_int(static_cast< int >(wxDIALOG_MODELESS)));
-  SWIG_Python_SetConstant(d, "USER_COLOURS",SWIG_From_int(static_cast< int >(wxUSER_COLOURS)));
-  SWIG_Python_SetConstant(d, "NO_3D",SWIG_From_int(static_cast< int >(wxNO_3D)));

   SWIG_Python_SetConstant(d, "FRAME_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxFRAME_EX_CONTEXTHELP)));
   SWIG_Python_SetConstant(d, "DIALOG_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxDIALOG_EX_CONTEXTHELP)));
   SWIG_Python_SetConstant(d, "FULLSCREEN_NOMENUBAR",SWIG_From_int(static_cast< int >(wxFULLSCREEN_NOMENUBAR)));
   SWIG_Python_SetConstant(d, "FRAME_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxFRAME_EX_CONTEXTHELP)));
   SWIG_Python_SetConstant(d, "DIALOG_EX_CONTEXTHELP",SWIG_From_int(static_cast< int >(wxDIALOG_EX_CONTEXTHELP)));
   SWIG_Python_SetConstant(d, "FULLSCREEN_NOMENUBAR",SWIG_From_int(static_cast< int >(wxFULLSCREEN_NOMENUBAR)));


@@ -34045,6 +34970,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "USER_ATTENTION_INFO",SWIG_From_int(static_cast< int >(wxUSER_ATTENTION_INFO)));
   SWIG_Python_SetConstant(d, "USER_ATTENTION_ERROR",SWIG_From_int(static_cast< int >(wxUSER_ATTENTION_ERROR)));
   SWIG_Python_SetConstant(d, "Dialog_ButtonSizerFlags",SWIG_From_int(static_cast< int >(wxDialog::ButtonSizerFlags)));
   SWIG_Python_SetConstant(d, "USER_ATTENTION_INFO",SWIG_From_int(static_cast< int >(wxUSER_ATTENTION_INFO)));
   SWIG_Python_SetConstant(d, "USER_ATTENTION_ERROR",SWIG_From_int(static_cast< int >(wxUSER_ATTENTION_ERROR)));
   SWIG_Python_SetConstant(d, "Dialog_ButtonSizerFlags",SWIG_From_int(static_cast< int >(wxDialog::ButtonSizerFlags)));

+  SWIG_Python_SetConstant(d, "DEFAULT_MINIFRAME_STYLE",SWIG_From_int(static_cast< int >(wxDEFAULT_MINIFRAME_STYLE)));

   SWIG_Python_SetConstant(d, "SPLASH_CENTRE_ON_PARENT",SWIG_From_int(static_cast< int >(wxSPLASH_CENTRE_ON_PARENT)));
   SWIG_Python_SetConstant(d, "SPLASH_CENTRE_ON_SCREEN",SWIG_From_int(static_cast< int >(wxSPLASH_CENTRE_ON_SCREEN)));
   SWIG_Python_SetConstant(d, "SPLASH_NO_CENTRE",SWIG_From_int(static_cast< int >(wxSPLASH_NO_CENTRE)));
   SWIG_Python_SetConstant(d, "SPLASH_CENTRE_ON_PARENT",SWIG_From_int(static_cast< int >(wxSPLASH_CENTRE_ON_PARENT)));
   SWIG_Python_SetConstant(d, "SPLASH_CENTRE_ON_SCREEN",SWIG_From_int(static_cast< int >(wxSPLASH_CENTRE_ON_SCREEN)));
   SWIG_Python_SetConstant(d, "SPLASH_NO_CENTRE",SWIG_From_int(static_cast< int >(wxSPLASH_NO_CENTRE)));


@@ -34104,6 +35030,9 @@ SWIGEXPORT void SWIG_init(void) {
   PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO));
   PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT));
   SWIG_addvarlink(SWIG_globals(),(char*)"VListBoxNameStr",VListBoxNameStr_get, VListBoxNameStr_set);
   PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO));
   PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT));
   SWIG_addvarlink(SWIG_globals(),(char*)"VListBoxNameStr",VListBoxNameStr_get, VListBoxNameStr_set);

+  SWIG_addvarlink(SWIG_globals(),(char*)"SimpleHtmlListBoxNameStr",SimpleHtmlListBoxNameStr_get, SimpleHtmlListBoxNameStr_set);
+  SWIG_Python_SetConstant(d, "HLB_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxHLB_DEFAULT_STYLE)));
+  SWIG_Python_SetConstant(d, "HLB_MULTIPLE",SWIG_From_int(static_cast< int >(wxHLB_MULTIPLE)));

   
   // Map renamed classes back to their common name for OOR
   wxPyPtrTypeMap_Add("wxHtmlListBox",     "wxPyHtmlListBox");
   
   // Map renamed classes back to their common name for OOR
   wxPyPtrTypeMap_Add("wxHtmlListBox",     "wxPyHtmlListBox");


@@ -34117,22 +35046,17 @@ SWIGEXPORT void SWIG_init(void) {
   PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_UP));
   PyDict_SetItemString(d, "wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_LEFT_DCLICK));
   PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_DCLICK));
   PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_UP));
   PyDict_SetItemString(d, "wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_LEFT_DCLICK));
   PyDict_SetItemString(d, "wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong(wxEVT_TASKBAR_RIGHT_DCLICK));

+  PyDict_SetItemString(d, "wxEVT_TASKBAR_CLICK", PyInt_FromLong(wxEVT_TASKBAR_CLICK));

   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"DirDialogNameStr",DirDialogNameStr_get, DirDialogNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"DirDialogNameStr",DirDialogNameStr_get, DirDialogNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);

+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "DD_DIR_MUST_EXIST",SWIG_From_int(static_cast< int >(wxDD_DIR_MUST_EXIST)));

   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));

-  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
-  SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
-  SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
-  SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
-  SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
-  SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
-  SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
-  SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));

   SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
   SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
   SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
   SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
   SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
   SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));


@@ -34144,6 +35068,14 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
   SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
   SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);
   SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
   SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
   SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);

+  SWIG_Python_SetConstant(d, "PD_AUTO_HIDE",SWIG_From_int(static_cast< int >(wxPD_AUTO_HIDE)));
+  SWIG_Python_SetConstant(d, "PD_APP_MODAL",SWIG_From_int(static_cast< int >(wxPD_APP_MODAL)));
+  SWIG_Python_SetConstant(d, "PD_CAN_ABORT",SWIG_From_int(static_cast< int >(wxPD_CAN_ABORT)));
+  SWIG_Python_SetConstant(d, "PD_ELAPSED_TIME",SWIG_From_int(static_cast< int >(wxPD_ELAPSED_TIME)));
+  SWIG_Python_SetConstant(d, "PD_ESTIMATED_TIME",SWIG_From_int(static_cast< int >(wxPD_ESTIMATED_TIME)));
+  SWIG_Python_SetConstant(d, "PD_REMAINING_TIME",SWIG_From_int(static_cast< int >(wxPD_REMAINING_TIME)));
+  SWIG_Python_SetConstant(d, "PD_SMOOTH",SWIG_From_int(static_cast< int >(wxPD_SMOOTH)));
+  SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));

   SWIG_Python_SetConstant(d, "FR_DOWN",SWIG_From_int(static_cast< int >(wxFR_DOWN)));
   SWIG_Python_SetConstant(d, "FR_WHOLEWORD",SWIG_From_int(static_cast< int >(wxFR_WHOLEWORD)));
   SWIG_Python_SetConstant(d, "FR_MATCHCASE",SWIG_From_int(static_cast< int >(wxFR_MATCHCASE)));
   SWIG_Python_SetConstant(d, "FR_DOWN",SWIG_From_int(static_cast< int >(wxFR_DOWN)));
   SWIG_Python_SetConstant(d, "FR_WHOLEWORD",SWIG_From_int(static_cast< int >(wxFR_WHOLEWORD)));
   SWIG_Python_SetConstant(d, "FR_MATCHCASE",SWIG_From_int(static_cast< int >(wxFR_MATCHCASE)));