SWIGged

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 456b87c9590f02d30c797fbeea39997cce05cfd7..ffb55803ffb13338021188ba45967132bfb90416 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -17,9 +17,7 @@ Added New Zealand NZST and NZDT timezone support to wx.DateTime.
 wx.Window.GetAdjustedBestSize is deprecated.  In every conceivable
 scenario GetBestFitting size is probably what you want to use instead.
 
 wx.Window.GetAdjustedBestSize is deprecated.  In every conceivable
 scenario GetBestFitting size is probably what you want to use instead.
 

-
-
-
+wx.Image: Gained support for TGA image file format.

 
 
 
 
 
 

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index 76d9f151ea50f034cf6d7050799214251522df8b..8feee0ed81c1a4e4917d06cdfb2013156c50fd4b 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -4744,6 +4744,14 @@ class BufferedDC(MemoryDC):
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 

+    def SetStyle(*args, **kwargs):
+        """SetStyle(self, int style)"""
+        return _gdi_.BufferedDC_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(self) -> int"""
+        return _gdi_.BufferedDC_GetStyle(*args, **kwargs)
+

 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):
 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index e9a344249dd0527ba55f0b3ee5e752dfcfc7b6f7..bb97e78e9b18c525609e9c5ced48f7d58a95c21e 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -24348,7 +24348,7 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;


@@ -24366,12 +24366,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {

-    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -24385,7 +24385,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedDC *)new wxBufferedDC(arg1,*arg2,arg3);

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


@@ -24449,7 +24449,8 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     int _v = 0;
     if (argc > 1) {
       {
     int _v = 0;
     if (argc > 1) {
       {

-        int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0);
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_wxBitmap, 0);

         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;
         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;


@@ -24523,6 +24524,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BufferedDC_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BufferedDC_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_SetStyle" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BufferedDC_SetStyle" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetStyle(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BufferedDC_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int 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_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_GetStyle" "', expected argument " "1"" of type '" "wxBufferedDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBufferedDC const *)arg1)->GetStyle();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -24537,7 +24604,7 @@ SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;


@@ -24561,12 +24628,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {

-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -24580,7 +24647,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,*arg2,arg3);

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


@@ -38653,6 +38720,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},

+        { (char *)"BufferedDC_SetStyle", (PyCFunction) _wrap_BufferedDC_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BufferedDC_GetStyle", (PyCFunction)_wrap_BufferedDC_GetStyle, METH_O, NULL},

         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 4af11a0939e9047a313108a04030689dfdc76b42..f2374619202bc6b337a48db0a0eb71b8377d2015 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -1630,7 +1630,7 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):

-        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        """GetHtmlWindow(self) -> HtmlWindow"""

         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index 79faf2b015f2478ad25190fc18b6f0ae481f73e6..166534674edf42d71b9b4bfab5cd125b1b7b81b7 100644 (file)
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -2550,122 +2550,121 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]

-#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
-#define SWIGTYPE_p_wxICOHandler swig_types[90]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
-#define SWIGTYPE_p_wxIdleEvent swig_types[92]
-#define SWIGTYPE_p_wxImage swig_types[93]
-#define SWIGTYPE_p_wxImageHandler swig_types[94]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
-#define SWIGTYPE_p_wxKeyEvent swig_types[98]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
-#define SWIGTYPE_p_wxMenu swig_types[105]
-#define SWIGTYPE_p_wxMenuBar swig_types[106]
-#define SWIGTYPE_p_wxMenuEvent swig_types[107]
-#define SWIGTYPE_p_wxMenuItem swig_types[108]
-#define SWIGTYPE_p_wxMessageDialog swig_types[109]
-#define SWIGTYPE_p_wxMiniFrame swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
-#define SWIGTYPE_p_wxMouseEvent swig_types[113]
-#define SWIGTYPE_p_wxMoveEvent swig_types[114]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
-#define SWIGTYPE_p_wxObject swig_types[120]
-#define SWIGTYPE_p_wxPCXHandler swig_types[121]
-#define SWIGTYPE_p_wxPNGHandler swig_types[122]
-#define SWIGTYPE_p_wxPNMHandler swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
-#define SWIGTYPE_p_wxPaintEvent swig_types[126]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
-#define SWIGTYPE_p_wxPanel swig_types[128]
-#define SWIGTYPE_p_wxPaperSize swig_types[129]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
-#define SWIGTYPE_p_wxPoint swig_types[131]
-#define SWIGTYPE_p_wxPopupWindow swig_types[132]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
-#define SWIGTYPE_p_wxPrintData swig_types[136]
-#define SWIGTYPE_p_wxPrintDialog swig_types[137]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
-#define SWIGTYPE_p_wxPrintPreview swig_types[139]
-#define SWIGTYPE_p_wxPrinter swig_types[140]
-#define SWIGTYPE_p_wxProgressDialog swig_types[141]
-#define SWIGTYPE_p_wxPyApp swig_types[142]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
-#define SWIGTYPE_p_wxPyEvent swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
-#define SWIGTYPE_p_wxPyPanel swig_types[151]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
-#define SWIGTYPE_p_wxPyPrintout swig_types[156]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
-#define SWIGTYPE_p_wxPySizer swig_types[158]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
-#define SWIGTYPE_p_wxPyVListBox swig_types[160]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
-#define SWIGTYPE_p_wxPyValidator swig_types[162]
-#define SWIGTYPE_p_wxPyWindow swig_types[163]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
-#define SWIGTYPE_p_wxSashEvent swig_types[166]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
-#define SWIGTYPE_p_wxSashWindow swig_types[168]
-#define SWIGTYPE_p_wxScrollEvent swig_types[169]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
-#define SWIGTYPE_p_wxShowEvent swig_types[173]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
-#define SWIGTYPE_p_wxSize swig_types[175]
-#define SWIGTYPE_p_wxSizeEvent swig_types[176]
-#define SWIGTYPE_p_wxSizer swig_types[177]
-#define SWIGTYPE_p_wxSizerItem swig_types[178]
-#define SWIGTYPE_p_wxSplashScreen swig_types[179]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
-#define SWIGTYPE_p_wxStatusBar swig_types[184]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
-#define SWIGTYPE_p_wxString swig_types[186]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
-#define SWIGTYPE_p_wxTGAHandler swig_types[188]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[189]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[190]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[191]
-#define SWIGTYPE_p_wxTipWindow swig_types[192]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[193]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[194]
-#define SWIGTYPE_p_wxValidator swig_types[195]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[196]
-#define SWIGTYPE_p_wxWindow swig_types[197]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[198]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[199]
-#define SWIGTYPE_p_wxXPMHandler swig_types[200]
-static swig_type_info *swig_types[202];
-static swig_module_info swig_module = {swig_types, 201, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
+#define SWIGTYPE_p_wxICOHandler swig_types[89]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
+#define SWIGTYPE_p_wxIdleEvent swig_types[91]
+#define SWIGTYPE_p_wxImage swig_types[92]
+#define SWIGTYPE_p_wxImageHandler swig_types[93]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
+#define SWIGTYPE_p_wxKeyEvent swig_types[97]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
+#define SWIGTYPE_p_wxMenu swig_types[104]
+#define SWIGTYPE_p_wxMenuBar swig_types[105]
+#define SWIGTYPE_p_wxMenuEvent swig_types[106]
+#define SWIGTYPE_p_wxMenuItem swig_types[107]
+#define SWIGTYPE_p_wxMessageDialog swig_types[108]
+#define SWIGTYPE_p_wxMiniFrame swig_types[109]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseEvent swig_types[112]
+#define SWIGTYPE_p_wxMoveEvent swig_types[113]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
+#define SWIGTYPE_p_wxObject swig_types[119]
+#define SWIGTYPE_p_wxPCXHandler swig_types[120]
+#define SWIGTYPE_p_wxPNGHandler swig_types[121]
+#define SWIGTYPE_p_wxPNMHandler swig_types[122]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
+#define SWIGTYPE_p_wxPaintEvent swig_types[125]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
+#define SWIGTYPE_p_wxPanel swig_types[127]
+#define SWIGTYPE_p_wxPaperSize swig_types[128]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
+#define SWIGTYPE_p_wxPoint swig_types[130]
+#define SWIGTYPE_p_wxPopupWindow swig_types[131]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
+#define SWIGTYPE_p_wxPrintData swig_types[135]
+#define SWIGTYPE_p_wxPrintDialog swig_types[136]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
+#define SWIGTYPE_p_wxPrintPreview swig_types[138]
+#define SWIGTYPE_p_wxPrinter swig_types[139]
+#define SWIGTYPE_p_wxProgressDialog swig_types[140]
+#define SWIGTYPE_p_wxPyApp swig_types[141]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
+#define SWIGTYPE_p_wxPyEvent swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
+#define SWIGTYPE_p_wxPyPanel swig_types[150]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
+#define SWIGTYPE_p_wxPyPrintout swig_types[155]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPySizer swig_types[157]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
+#define SWIGTYPE_p_wxPyVListBox swig_types[159]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
+#define SWIGTYPE_p_wxPyValidator swig_types[161]
+#define SWIGTYPE_p_wxPyWindow swig_types[162]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
+#define SWIGTYPE_p_wxSashEvent swig_types[165]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
+#define SWIGTYPE_p_wxSashWindow swig_types[167]
+#define SWIGTYPE_p_wxScrollEvent swig_types[168]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
+#define SWIGTYPE_p_wxShowEvent swig_types[172]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
+#define SWIGTYPE_p_wxSize swig_types[174]
+#define SWIGTYPE_p_wxSizeEvent swig_types[175]
+#define SWIGTYPE_p_wxSizer swig_types[176]
+#define SWIGTYPE_p_wxSizerItem swig_types[177]
+#define SWIGTYPE_p_wxSplashScreen swig_types[178]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
+#define SWIGTYPE_p_wxStatusBar swig_types[183]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
+#define SWIGTYPE_p_wxString swig_types[185]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
+#define SWIGTYPE_p_wxTGAHandler swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14761,7 +14760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;

-  wxHtmlWindow *result = 0 ;
+  wxPyHtmlWindow *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -14775,11 +14774,13 @@ SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();
+    result = (wxPyHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindow, 0 |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

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


@@ -19470,7 +19471,6 @@ static swig_type_info _swigt__p_wxHtmlTag = {"_p_wxHtmlTag", "wxHtmlTag *", 0, 0
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};


@@ -19621,7 +19621,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,

-  &_swigt__p_wxHtmlWindow,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19876,7 +19875,6 @@ static swig_cast_info _swigc__p_wxHtmlTag[] = {  {&_swigt__p_wxHtmlTag, 0, 0, 0}
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -20027,7 +20025,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,

-  _swigc__p_wxHtmlWindow,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,

diff --git a/wxPython/src/gtk/xrc.py b/wxPython/src/gtk/xrc.py
index ea2d50be662cc729e45741f9521f9cf5835c05ea..5bbd09e39e681d140a1cfdd0b17dcbdf2169abaa 100644 (file)
--- a/wxPython/src/gtk/xrc.py
+++ b/wxPython/src/gtk/xrc.py
@@ -708,7 +708,12 @@ TheXmlResource = XmlResource_Get()
 
 
 def _my_import(name):
 
 
 def _my_import(name):

-    mod = __import__(name)
+    try:
+        mod = __import__(name)
+    except ImportError:
+        import traceback
+        print traceback.format_exc()
+        raise

     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)
     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 90816c865809edb2f473d1d3bb585cc8025be100..ce9847fafae71528a5f87c51711fa3b0eb4aa30c 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -4743,6 +4743,14 @@ class BufferedDC(MemoryDC):
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 

+    def SetStyle(*args, **kwargs):
+        """SetStyle(self, int style)"""
+        return _gdi_.BufferedDC_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(self) -> int"""
+        return _gdi_.BufferedDC_GetStyle(*args, **kwargs)
+

 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):
 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index 8be09f7f8b218bd340b9b3ec7f6774172eb08d14..38e59e941e9ea2dab0e709bbe8ba81109803534a 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -24333,7 +24333,7 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;


@@ -24351,12 +24351,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {

-    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -24370,7 +24370,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedDC *)new wxBufferedDC(arg1,*arg2,arg3);

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


@@ -24434,7 +24434,8 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     int _v = 0;
     if (argc > 1) {
       {
     int _v = 0;
     if (argc > 1) {
       {

-        int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0);
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_wxBitmap, 0);

         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;
         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;


@@ -24508,6 +24509,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BufferedDC_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BufferedDC_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_SetStyle" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BufferedDC_SetStyle" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetStyle(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BufferedDC_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int 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_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_GetStyle" "', expected argument " "1"" of type '" "wxBufferedDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBufferedDC const *)arg1)->GetStyle();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -24522,7 +24589,7 @@ SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;


@@ -24546,12 +24613,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {

-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -24565,7 +24632,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,*arg2,arg3);

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


@@ -38862,6 +38929,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},

+        { (char *)"BufferedDC_SetStyle", (PyCFunction) _wrap_BufferedDC_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BufferedDC_GetStyle", (PyCFunction)_wrap_BufferedDC_GetStyle, METH_O, NULL},

         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index 4af11a0939e9047a313108a04030689dfdc76b42..f2374619202bc6b337a48db0a0eb71b8377d2015 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -1630,7 +1630,7 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):

-        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        """GetHtmlWindow(self) -> HtmlWindow"""

         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index ebbb5d36e250d0580242e1c8ce634f053fe03d00..57492c1dc7716de92bf3eb8b29e2144cd06067de 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -2550,122 +2550,121 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]

-#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
-#define SWIGTYPE_p_wxICOHandler swig_types[90]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
-#define SWIGTYPE_p_wxIdleEvent swig_types[92]
-#define SWIGTYPE_p_wxImage swig_types[93]
-#define SWIGTYPE_p_wxImageHandler swig_types[94]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
-#define SWIGTYPE_p_wxKeyEvent swig_types[98]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
-#define SWIGTYPE_p_wxMenu swig_types[105]
-#define SWIGTYPE_p_wxMenuBar swig_types[106]
-#define SWIGTYPE_p_wxMenuEvent swig_types[107]
-#define SWIGTYPE_p_wxMenuItem swig_types[108]
-#define SWIGTYPE_p_wxMessageDialog swig_types[109]
-#define SWIGTYPE_p_wxMiniFrame swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
-#define SWIGTYPE_p_wxMouseEvent swig_types[113]
-#define SWIGTYPE_p_wxMoveEvent swig_types[114]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
-#define SWIGTYPE_p_wxObject swig_types[120]
-#define SWIGTYPE_p_wxPCXHandler swig_types[121]
-#define SWIGTYPE_p_wxPNGHandler swig_types[122]
-#define SWIGTYPE_p_wxPNMHandler swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
-#define SWIGTYPE_p_wxPaintEvent swig_types[126]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
-#define SWIGTYPE_p_wxPanel swig_types[128]
-#define SWIGTYPE_p_wxPaperSize swig_types[129]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
-#define SWIGTYPE_p_wxPoint swig_types[131]
-#define SWIGTYPE_p_wxPopupWindow swig_types[132]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
-#define SWIGTYPE_p_wxPrintData swig_types[136]
-#define SWIGTYPE_p_wxPrintDialog swig_types[137]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
-#define SWIGTYPE_p_wxPrintPreview swig_types[139]
-#define SWIGTYPE_p_wxPrinter swig_types[140]
-#define SWIGTYPE_p_wxProgressDialog swig_types[141]
-#define SWIGTYPE_p_wxPyApp swig_types[142]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
-#define SWIGTYPE_p_wxPyEvent swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
-#define SWIGTYPE_p_wxPyPanel swig_types[151]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
-#define SWIGTYPE_p_wxPyPrintout swig_types[156]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
-#define SWIGTYPE_p_wxPySizer swig_types[158]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
-#define SWIGTYPE_p_wxPyVListBox swig_types[160]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
-#define SWIGTYPE_p_wxPyValidator swig_types[162]
-#define SWIGTYPE_p_wxPyWindow swig_types[163]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
-#define SWIGTYPE_p_wxSashEvent swig_types[166]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
-#define SWIGTYPE_p_wxSashWindow swig_types[168]
-#define SWIGTYPE_p_wxScrollEvent swig_types[169]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
-#define SWIGTYPE_p_wxShowEvent swig_types[173]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
-#define SWIGTYPE_p_wxSize swig_types[175]
-#define SWIGTYPE_p_wxSizeEvent swig_types[176]
-#define SWIGTYPE_p_wxSizer swig_types[177]
-#define SWIGTYPE_p_wxSizerItem swig_types[178]
-#define SWIGTYPE_p_wxSplashScreen swig_types[179]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
-#define SWIGTYPE_p_wxStatusBar swig_types[184]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
-#define SWIGTYPE_p_wxString swig_types[186]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
-#define SWIGTYPE_p_wxTGAHandler swig_types[188]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[189]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[190]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[191]
-#define SWIGTYPE_p_wxTipWindow swig_types[192]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[193]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[194]
-#define SWIGTYPE_p_wxValidator swig_types[195]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[196]
-#define SWIGTYPE_p_wxWindow swig_types[197]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[198]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[199]
-#define SWIGTYPE_p_wxXPMHandler swig_types[200]
-static swig_type_info *swig_types[202];
-static swig_module_info swig_module = {swig_types, 201, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
+#define SWIGTYPE_p_wxICOHandler swig_types[89]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
+#define SWIGTYPE_p_wxIdleEvent swig_types[91]
+#define SWIGTYPE_p_wxImage swig_types[92]
+#define SWIGTYPE_p_wxImageHandler swig_types[93]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
+#define SWIGTYPE_p_wxKeyEvent swig_types[97]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
+#define SWIGTYPE_p_wxMenu swig_types[104]
+#define SWIGTYPE_p_wxMenuBar swig_types[105]
+#define SWIGTYPE_p_wxMenuEvent swig_types[106]
+#define SWIGTYPE_p_wxMenuItem swig_types[107]
+#define SWIGTYPE_p_wxMessageDialog swig_types[108]
+#define SWIGTYPE_p_wxMiniFrame swig_types[109]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseEvent swig_types[112]
+#define SWIGTYPE_p_wxMoveEvent swig_types[113]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
+#define SWIGTYPE_p_wxObject swig_types[119]
+#define SWIGTYPE_p_wxPCXHandler swig_types[120]
+#define SWIGTYPE_p_wxPNGHandler swig_types[121]
+#define SWIGTYPE_p_wxPNMHandler swig_types[122]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
+#define SWIGTYPE_p_wxPaintEvent swig_types[125]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
+#define SWIGTYPE_p_wxPanel swig_types[127]
+#define SWIGTYPE_p_wxPaperSize swig_types[128]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
+#define SWIGTYPE_p_wxPoint swig_types[130]
+#define SWIGTYPE_p_wxPopupWindow swig_types[131]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
+#define SWIGTYPE_p_wxPrintData swig_types[135]
+#define SWIGTYPE_p_wxPrintDialog swig_types[136]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
+#define SWIGTYPE_p_wxPrintPreview swig_types[138]
+#define SWIGTYPE_p_wxPrinter swig_types[139]
+#define SWIGTYPE_p_wxProgressDialog swig_types[140]
+#define SWIGTYPE_p_wxPyApp swig_types[141]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
+#define SWIGTYPE_p_wxPyEvent swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
+#define SWIGTYPE_p_wxPyPanel swig_types[150]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
+#define SWIGTYPE_p_wxPyPrintout swig_types[155]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPySizer swig_types[157]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
+#define SWIGTYPE_p_wxPyVListBox swig_types[159]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
+#define SWIGTYPE_p_wxPyValidator swig_types[161]
+#define SWIGTYPE_p_wxPyWindow swig_types[162]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
+#define SWIGTYPE_p_wxSashEvent swig_types[165]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
+#define SWIGTYPE_p_wxSashWindow swig_types[167]
+#define SWIGTYPE_p_wxScrollEvent swig_types[168]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
+#define SWIGTYPE_p_wxShowEvent swig_types[172]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
+#define SWIGTYPE_p_wxSize swig_types[174]
+#define SWIGTYPE_p_wxSizeEvent swig_types[175]
+#define SWIGTYPE_p_wxSizer swig_types[176]
+#define SWIGTYPE_p_wxSizerItem swig_types[177]
+#define SWIGTYPE_p_wxSplashScreen swig_types[178]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
+#define SWIGTYPE_p_wxStatusBar swig_types[183]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
+#define SWIGTYPE_p_wxString swig_types[185]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
+#define SWIGTYPE_p_wxTGAHandler swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14761,7 +14760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;

-  wxHtmlWindow *result = 0 ;
+  wxPyHtmlWindow *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -14775,11 +14774,13 @@ SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();
+    result = (wxPyHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindow, 0 |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

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


@@ -19476,7 +19477,6 @@ static swig_type_info _swigt__p_wxHtmlTag = {"_p_wxHtmlTag", "wxHtmlTag *", 0, 0
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};


@@ -19627,7 +19627,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,

-  &_swigt__p_wxHtmlWindow,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19882,7 +19881,6 @@ static swig_cast_info _swigc__p_wxHtmlTag[] = {  {&_swigt__p_wxHtmlTag, 0, 0, 0}
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -20033,7 +20031,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,

-  _swigc__p_wxHtmlWindow,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,

diff --git a/wxPython/src/mac/xrc.py b/wxPython/src/mac/xrc.py
index ea2d50be662cc729e45741f9521f9cf5835c05ea..5bbd09e39e681d140a1cfdd0b17dcbdf2169abaa 100644 (file)
--- a/wxPython/src/mac/xrc.py
+++ b/wxPython/src/mac/xrc.py
@@ -708,7 +708,12 @@ TheXmlResource = XmlResource_Get()
 
 
 def _my_import(name):
 
 
 def _my_import(name):

-    mod = __import__(name)
+    try:
+        mod = __import__(name)
+    except ImportError:
+        import traceback
+        print traceback.format_exc()
+        raise

     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)
     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index 2206b5554e35226b96653dd95c12af5df1a925ec..ec4122bacedea5863e4d4d386414e24435178f55 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -4837,6 +4837,14 @@ class BufferedDC(MemoryDC):
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 
         """
         return _gdi_.BufferedDC_UnMask(*args, **kwargs)
 

+    def SetStyle(*args, **kwargs):
+        """SetStyle(self, int style)"""
+        return _gdi_.BufferedDC_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(self) -> int"""
+        return _gdi_.BufferedDC_GetStyle(*args, **kwargs)
+

 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):
 _gdi_.BufferedDC_swigregister(BufferedDC)
 
 class BufferedPaintDC(BufferedDC):

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 3f07e98d849879077bb07855744d5e781c8093f9..b953e13723ff584e9f17c9c611fdd50ae7796839 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -25036,7 +25036,7 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
   PyObject *resultobj = 0;
   wxDC *arg1 = (wxDC *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedDC *result = 0 ;


@@ -25054,12 +25054,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {
   }
   arg1 = reinterpret_cast< wxDC * >(argp1);
   if (swig_obj[1]) {

-    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -25073,7 +25073,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedDC *)new wxBufferedDC(arg1,*arg2,arg3);

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


@@ -25137,7 +25137,8 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
     int _v = 0;
     if (argc > 1) {
       {
     int _v = 0;
     if (argc > 1) {
       {

-        int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0);
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_wxBitmap, 0);

         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;
         _v = SWIG_CheckState(res);
       }
       if (!_v) goto check_1;


@@ -25211,6 +25212,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BufferedDC_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "style", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BufferedDC_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_SetStyle" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BufferedDC_SetStyle" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetStyle(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BufferedDC_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
+  int 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_wxBufferedDC, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_GetStyle" "', expected argument " "1"" of type '" "wxBufferedDC const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBufferedDC * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBufferedDC const *)arg1)->GetStyle();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -25225,7 +25292,7 @@ SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;

-  wxBitmap const &arg2_defvalue = wxNullBitmap ;
+  wxBitmap &arg2_defvalue = wxNullBitmap ;

   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;
   wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
   int arg3 = (int) wxBUFFER_CLIENT_AREA ;
   wxBufferedPaintDC *result = 0 ;


@@ -25249,12 +25316,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {
   }
   arg1 = reinterpret_cast< wxWindow * >(argp1);
   if (obj1) {

-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0 );

     if (!SWIG_IsOK(res2)) {
     if (!SWIG_IsOK(res2)) {

-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     if (!argp2) {
     }
     if (!argp2) {

-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); 

     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }
     }
     arg2 = reinterpret_cast< wxBitmap * >(argp2);
   }


@@ -25268,7 +25335,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3);
+    result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,*arg2,arg3);

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


@@ -39623,6 +39690,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},
         { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL},
         { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL},
         { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL},

+        { (char *)"BufferedDC_SetStyle", (PyCFunction) _wrap_BufferedDC_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BufferedDC_GetStyle", (PyCFunction)_wrap_BufferedDC_GetStyle, METH_O, NULL},

         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL},
         { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL},
         { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 4af11a0939e9047a313108a04030689dfdc76b42..f2374619202bc6b337a48db0a0eb71b8377d2015 100644 (file)
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -1630,7 +1630,7 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):

-        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        """GetHtmlWindow(self) -> HtmlWindow"""

         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index 79faf2b015f2478ad25190fc18b6f0ae481f73e6..166534674edf42d71b9b4bfab5cd125b1b7b81b7 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -2550,122 +2550,121 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]
 #define SWIGTYPE_p_wxHtmlTagHandler swig_types[84]
 #define SWIGTYPE_p_wxHtmlWidgetCell swig_types[85]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[86]

-#define SWIGTYPE_p_wxHtmlWindow swig_types[87]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[88]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[89]
-#define SWIGTYPE_p_wxICOHandler swig_types[90]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[91]
-#define SWIGTYPE_p_wxIdleEvent swig_types[92]
-#define SWIGTYPE_p_wxImage swig_types[93]
-#define SWIGTYPE_p_wxImageHandler swig_types[94]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[95]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[96]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[97]
-#define SWIGTYPE_p_wxKeyEvent swig_types[98]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[99]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[100]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[101]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[102]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[103]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[104]
-#define SWIGTYPE_p_wxMenu swig_types[105]
-#define SWIGTYPE_p_wxMenuBar swig_types[106]
-#define SWIGTYPE_p_wxMenuEvent swig_types[107]
-#define SWIGTYPE_p_wxMenuItem swig_types[108]
-#define SWIGTYPE_p_wxMessageDialog swig_types[109]
-#define SWIGTYPE_p_wxMiniFrame swig_types[110]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[111]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[112]
-#define SWIGTYPE_p_wxMouseEvent swig_types[113]
-#define SWIGTYPE_p_wxMoveEvent swig_types[114]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[115]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[116]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[117]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[118]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[119]
-#define SWIGTYPE_p_wxObject swig_types[120]
-#define SWIGTYPE_p_wxPCXHandler swig_types[121]
-#define SWIGTYPE_p_wxPNGHandler swig_types[122]
-#define SWIGTYPE_p_wxPNMHandler swig_types[123]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[124]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[125]
-#define SWIGTYPE_p_wxPaintEvent swig_types[126]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[127]
-#define SWIGTYPE_p_wxPanel swig_types[128]
-#define SWIGTYPE_p_wxPaperSize swig_types[129]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[130]
-#define SWIGTYPE_p_wxPoint swig_types[131]
-#define SWIGTYPE_p_wxPopupWindow swig_types[132]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[133]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[134]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[135]
-#define SWIGTYPE_p_wxPrintData swig_types[136]
-#define SWIGTYPE_p_wxPrintDialog swig_types[137]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[138]
-#define SWIGTYPE_p_wxPrintPreview swig_types[139]
-#define SWIGTYPE_p_wxPrinter swig_types[140]
-#define SWIGTYPE_p_wxProgressDialog swig_types[141]
-#define SWIGTYPE_p_wxPyApp swig_types[142]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[143]
-#define SWIGTYPE_p_wxPyEvent swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[145]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[146]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[147]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[148]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[149]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[150]
-#define SWIGTYPE_p_wxPyPanel swig_types[151]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[152]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[153]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[154]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[155]
-#define SWIGTYPE_p_wxPyPrintout swig_types[156]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[157]
-#define SWIGTYPE_p_wxPySizer swig_types[158]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[159]
-#define SWIGTYPE_p_wxPyVListBox swig_types[160]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[161]
-#define SWIGTYPE_p_wxPyValidator swig_types[162]
-#define SWIGTYPE_p_wxPyWindow swig_types[163]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[164]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[165]
-#define SWIGTYPE_p_wxSashEvent swig_types[166]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[167]
-#define SWIGTYPE_p_wxSashWindow swig_types[168]
-#define SWIGTYPE_p_wxScrollEvent swig_types[169]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[170]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[171]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[172]
-#define SWIGTYPE_p_wxShowEvent swig_types[173]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[174]
-#define SWIGTYPE_p_wxSize swig_types[175]
-#define SWIGTYPE_p_wxSizeEvent swig_types[176]
-#define SWIGTYPE_p_wxSizer swig_types[177]
-#define SWIGTYPE_p_wxSizerItem swig_types[178]
-#define SWIGTYPE_p_wxSplashScreen swig_types[179]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[180]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[181]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[182]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[183]
-#define SWIGTYPE_p_wxStatusBar swig_types[184]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[185]
-#define SWIGTYPE_p_wxString swig_types[186]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[187]
-#define SWIGTYPE_p_wxTGAHandler swig_types[188]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[189]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[190]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[191]
-#define SWIGTYPE_p_wxTipWindow swig_types[192]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[193]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[194]
-#define SWIGTYPE_p_wxValidator swig_types[195]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[196]
-#define SWIGTYPE_p_wxWindow swig_types[197]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[198]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[199]
-#define SWIGTYPE_p_wxXPMHandler swig_types[200]
-static swig_type_info *swig_types[202];
-static swig_module_info swig_module = {swig_types, 201, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
+#define SWIGTYPE_p_wxICOHandler swig_types[89]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
+#define SWIGTYPE_p_wxIdleEvent swig_types[91]
+#define SWIGTYPE_p_wxImage swig_types[92]
+#define SWIGTYPE_p_wxImageHandler swig_types[93]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
+#define SWIGTYPE_p_wxKeyEvent swig_types[97]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
+#define SWIGTYPE_p_wxMenu swig_types[104]
+#define SWIGTYPE_p_wxMenuBar swig_types[105]
+#define SWIGTYPE_p_wxMenuEvent swig_types[106]
+#define SWIGTYPE_p_wxMenuItem swig_types[107]
+#define SWIGTYPE_p_wxMessageDialog swig_types[108]
+#define SWIGTYPE_p_wxMiniFrame swig_types[109]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[111]
+#define SWIGTYPE_p_wxMouseEvent swig_types[112]
+#define SWIGTYPE_p_wxMoveEvent swig_types[113]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[114]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[115]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[116]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[117]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[118]
+#define SWIGTYPE_p_wxObject swig_types[119]
+#define SWIGTYPE_p_wxPCXHandler swig_types[120]
+#define SWIGTYPE_p_wxPNGHandler swig_types[121]
+#define SWIGTYPE_p_wxPNMHandler swig_types[122]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[123]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[124]
+#define SWIGTYPE_p_wxPaintEvent swig_types[125]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[126]
+#define SWIGTYPE_p_wxPanel swig_types[127]
+#define SWIGTYPE_p_wxPaperSize swig_types[128]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[129]
+#define SWIGTYPE_p_wxPoint swig_types[130]
+#define SWIGTYPE_p_wxPopupWindow swig_types[131]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[132]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[133]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[134]
+#define SWIGTYPE_p_wxPrintData swig_types[135]
+#define SWIGTYPE_p_wxPrintDialog swig_types[136]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[137]
+#define SWIGTYPE_p_wxPrintPreview swig_types[138]
+#define SWIGTYPE_p_wxPrinter swig_types[139]
+#define SWIGTYPE_p_wxProgressDialog swig_types[140]
+#define SWIGTYPE_p_wxPyApp swig_types[141]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[142]
+#define SWIGTYPE_p_wxPyEvent swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[146]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[147]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[148]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[149]
+#define SWIGTYPE_p_wxPyPanel swig_types[150]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[151]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[152]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[153]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[154]
+#define SWIGTYPE_p_wxPyPrintout swig_types[155]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPySizer swig_types[157]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[158]
+#define SWIGTYPE_p_wxPyVListBox swig_types[159]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[160]
+#define SWIGTYPE_p_wxPyValidator swig_types[161]
+#define SWIGTYPE_p_wxPyWindow swig_types[162]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[163]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[164]
+#define SWIGTYPE_p_wxSashEvent swig_types[165]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[166]
+#define SWIGTYPE_p_wxSashWindow swig_types[167]
+#define SWIGTYPE_p_wxScrollEvent swig_types[168]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[169]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[170]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[171]
+#define SWIGTYPE_p_wxShowEvent swig_types[172]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[173]
+#define SWIGTYPE_p_wxSize swig_types[174]
+#define SWIGTYPE_p_wxSizeEvent swig_types[175]
+#define SWIGTYPE_p_wxSizer swig_types[176]
+#define SWIGTYPE_p_wxSizerItem swig_types[177]
+#define SWIGTYPE_p_wxSplashScreen swig_types[178]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[179]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[180]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[181]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[182]
+#define SWIGTYPE_p_wxStatusBar swig_types[183]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[184]
+#define SWIGTYPE_p_wxString swig_types[185]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[186]
+#define SWIGTYPE_p_wxTGAHandler swig_types[187]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[188]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[189]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[190]
+#define SWIGTYPE_p_wxTipWindow swig_types[191]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[192]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[193]
+#define SWIGTYPE_p_wxValidator swig_types[194]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[195]
+#define SWIGTYPE_p_wxWindow swig_types[196]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[197]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[198]
+#define SWIGTYPE_p_wxXPMHandler swig_types[199]
+static swig_type_info *swig_types[201];
+static swig_module_info swig_module = {swig_types, 200, 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)
 


@@ -14761,7 +14760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlHelpWindow *arg1 = (wxHtmlHelpWindow *) 0 ;

-  wxHtmlWindow *result = 0 ;
+  wxPyHtmlWindow *result = 0 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -14775,11 +14774,13 @@ SWIGINTERN PyObject *_wrap_HtmlHelpWindow_GetHtmlWindow(PyObject *SWIGUNUSEDPARM
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxHtmlHelpWindow * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();
+    result = (wxPyHtmlWindow *)((wxHtmlHelpWindow const *)arg1)->GetHtmlWindow();

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

-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindow, 0 |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

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


@@ -19470,7 +19471,6 @@ static swig_type_info _swigt__p_wxHtmlTag = {"_p_wxHtmlTag", "wxHtmlTag *", 0, 0
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlTagHandler = {"_p_wxHtmlTagHandler", "wxHtmlTagHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHtmlWidgetCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};

-static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};


@@ -19621,7 +19621,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlTagHandler,
   &_swigt__p_wxHtmlWidgetCell,
   &_swigt__p_wxHtmlWinParser,

-  &_swigt__p_wxHtmlWindow,

   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxHtmlWindowInterface,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,


@@ -19876,7 +19875,6 @@ static swig_cast_info _swigc__p_wxHtmlTag[] = {  {&_swigt__p_wxHtmlTag, 0, 0, 0}
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlTagHandler[] = {  {&_swigt__p_wxHtmlTagHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidgetCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};

-static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -20027,7 +20025,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlTagHandler,
   _swigc__p_wxHtmlWidgetCell,
   _swigc__p_wxHtmlWinParser,

-  _swigc__p_wxHtmlWindow,

   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxHtmlWindowInterface,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,

diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py
index ea2d50be662cc729e45741f9521f9cf5835c05ea..5bbd09e39e681d140a1cfdd0b17dcbdf2169abaa 100644 (file)
--- a/wxPython/src/msw/xrc.py
+++ b/wxPython/src/msw/xrc.py
@@ -708,7 +708,12 @@ TheXmlResource = XmlResource_Get()
 
 
 def _my_import(name):
 
 
 def _my_import(name):

-    mod = __import__(name)
+    try:
+        mod = __import__(name)
+    except ImportError:
+        import traceback
+        print traceback.format_exc()
+        raise

     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)
     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)