]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e58dab2)
Demo cleanup and path issues.
authorRobin Dunn <robin@alldunn.com>
Thu, 24 Jan 2002 01:24:39 +0000 (01:24 +0000)
committerRobin Dunn <robin@alldunn.com>
Thu, 24 Jan 2002 01:24:39 +0000 (01:24 +0000)
other tweaks.

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

13 files changed:
wxPython/demo/Main.py patch | blob | blame | history
wxPython/demo/XML_Resource.py patch | blob | blame | history
wxPython/demo/hangman.py patch | blob | blame | history
wxPython/demo/wxHtmlWindow.py patch | blob | blame | history
wxPython/demo/wxImage.py patch | blob | blame | history
wxPython/demo/wxMimeTypesManager.py patch | blob | blame | history
wxPython/demo/wxStaticBitmap.py patch | blob | blame | history
wxPython/demo/wxWave.py patch | blob | blame | history
wxPython/setup.py patch | blob | blame | history
wxPython/src/html.i patch | blob | blame | history
wxPython/src/msw/controls2.cpp patch | blob | blame | history
wxPython/src/msw/html.cpp patch | blob | blame | history
wxPython/src/my_typemaps.i patch | blob | blame | history

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 4ee72f29a1b556dce10b09d921a860e16cf071db..8e630857eff261203560c83477588429d26853af 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,7 +11,7 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
-import sys, os, time
+import sys, os, time, string
 from   wxPython.wx import *
 from   wxPython.lib.splashscreen import SplashScreen
 from   wxPython.html import wxHtmlWindow
 from   wxPython.wx import *
 from   wxPython.lib.splashscreen import SplashScreen
 from   wxPython.html import wxHtmlWindow
@@ -95,6 +95,13 @@ class MyLog(wxPyLog):
         self.tc.AppendText(message + '\n')
 
 
         self.tc.AppendText(message + '\n')
 
 
+#---------------------------------------------------------------------------
+
+def opj(path):
+    """Convert paths to the platform-specific separator"""
+    return apply(os.path.join, tuple(string.split(path, '/')))
+
+
 #---------------------------------------------------------------------------
 
 class wxPythonDemo(wxFrame):
 #---------------------------------------------------------------------------
 
 class wxPythonDemo(wxFrame):
@@ -374,7 +381,6 @@ class wxPythonDemo(wxFrame):
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')
-            #text = '<font size="-1"><pre>' + text + '</pre></font>'
         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 
         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 
@@ -466,7 +472,7 @@ class wxPythonDemo(wxFrame):
 
 class MySplashScreen(wxSplashScreen):
     def __init__(self):
 
 class MySplashScreen(wxSplashScreen):
     def __init__(self):
-        bmp = wxImage('bitmaps/splash.gif').ConvertToBitmap()
+        bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap()
         wxSplashScreen.__init__(self, bmp,
                                 wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
                                 4000, None, -1)
         wxSplashScreen.__init__(self, bmp,
                                 wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
                                 4000, None, -1)
@@ -480,15 +486,15 @@ class MySplashScreen(wxSplashScreen):
 
     def ShowTip(self, frame):
         try:
 
     def ShowTip(self, frame):
         try:
-            showTipText = open("data/showTips").read()
+            showTipText = open(opj("data/showTips")).read()
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
         if showTip:
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
         if showTip:
-            tp = wxCreateFileTipProvider("data/tips.txt", index)
+            tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)
             showTip = wxShowTip(frame, tp)
             index = tp.GetCurrentTip()
             showTip = wxShowTip(frame, tp)
             index = tp.GetCurrentTip()
-            open("data/showTips", "w").write(str( (showTip, index) ))
+            open(opj("data/showTips"), "w").write(str( (showTip, index) ))
 
 
 
 
 
 
diff --git a/wxPython/demo/XML_Resource.py b/wxPython/demo/XML_Resource.py
index d89f84d03612b1b3bd822b27f1c59ceab4bdb518..ba5350f5396944ec3d6ae7ebe5b4cca5b43fdcd5 100644 (file)
--- a/wxPython/demo/XML_Resource.py
+++ b/wxPython/demo/XML_Resource.py
@@ -1,10 +1,11 @@
 
 from wxPython.wx import *
 from wxPython.xrc import *
 
 from wxPython.wx import *
 from wxPython.xrc import *
+from Main import opj
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
-RESFILE = "data/resource_wdr.xrc"
+RESFILE = opj("data/resource_wdr.xrc")
 
 class TestPanel(wxPanel):
     def __init__(self, parent, log):
 
 class TestPanel(wxPanel):
     def __init__(self, parent, log):
diff --git a/wxPython/demo/hangman.py b/wxPython/demo/hangman.py
index 6d59a85d15e7f433b9a41a69e078775a1a7ed48e..eb591471a8a1895ce538a4f9ca8aa02625caea64 100644 (file)
--- a/wxPython/demo/hangman.py
+++ b/wxPython/demo/hangman.py
@@ -294,7 +294,7 @@ class MyFrame(wxFrame):
         menu = wxMenu()
         #menu.Append(1010, "Internal", "Use internal dictionary", TRUE)
         menu.Append(1011, "ASCII File...")
         menu = wxMenu()
         #menu.Append(1010, "Internal", "Use internal dictionary", TRUE)
         menu.Append(1011, "ASCII File...")
-        urls = [ 'wxPython home', 'http://alldunn.com/wxPython/main.html',
+        urls = [ 'wxPython home', 'http://wxPython.org/',
                  'slashdot.org', 'http://slashdot.org/',
                  'cnn.com', 'http://cnn.com',
                  'The New York Times', 'http://www.nytimes.com',
                  'slashdot.org', 'http://slashdot.org/',
                  'cnn.com', 'http://cnn.com',
                  'The New York Times', 'http://www.nytimes.com',
diff --git a/wxPython/demo/wxHtmlWindow.py b/wxPython/demo/wxHtmlWindow.py
index cd15d3f131dfebb44157247761b35946441ff7d0..942dea61342a8b24654146df29cc486748706e13 100644 (file)
--- a/wxPython/demo/wxHtmlWindow.py
+++ b/wxPython/demo/wxHtmlWindow.py
@@ -5,6 +5,8 @@ from   wxPython.wx         import *
 from   wxPython.html       import *
 import wxPython.lib.wxpTag
 
 from   wxPython.html       import *
 import wxPython.lib.wxpTag
 
+from Main import opj
+
 #----------------------------------------------------------------------
 
 # This shows how to catch the OnLinkClicked non-event.  (It's a virtual
 #----------------------------------------------------------------------
 
 # This shows how to catch the OnLinkClicked non-event.  (It's a virtual
@@ -104,7 +106,7 @@ class TestHtmlPanel(wxPanel):
 
 
     def OnShowDefault(self, event):
 
 
     def OnShowDefault(self, event):
-        name = os.path.join(self.cwd, 'data/test.htm')
+        name = os.path.join(self.cwd, opj('data/test.htm'))
         self.html.LoadPage(name)
 
 
         self.html.LoadPage(name)
 
 
@@ -118,7 +120,7 @@ class TestHtmlPanel(wxPanel):
 
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
 
     def OnWithWidgets(self, event):
         os.chdir(self.cwd)
-        name = os.path.join(self.cwd, 'data/widgetTest.htm')
+        name = os.path.join(self.cwd, opj('data/widgetTest.htm'))
         self.html.LoadPage(name)
 
 
         self.html.LoadPage(name)
 
 
diff --git a/wxPython/demo/wxImage.py b/wxPython/demo/wxImage.py
index bed1c2ca8b5fcb9efe09b0874ddb2cf4533342ee..6a15003e85f12d3695696272e06f2f3ba188bf0b 100644 (file)
--- a/wxPython/demo/wxImage.py
+++ b/wxPython/demo/wxImage.py
@@ -1,13 +1,14 @@
 
 from wxPython.wx import *
 
 from wxPython.wx import *
+from Main import opj
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    bmp = wxImage('bitmaps/image.bmp', wxBITMAP_TYPE_BMP).ConvertToBitmap()
-    gif = wxImage('bitmaps/image.gif', wxBITMAP_TYPE_GIF).ConvertToBitmap()
-    png = wxImage('bitmaps/image.png', wxBITMAP_TYPE_PNG).ConvertToBitmap()
-    jpg = wxImage('bitmaps/image.jpg', wxBITMAP_TYPE_JPEG).ConvertToBitmap()
+    bmp = wxImage(opj('bitmaps/image.bmp'), wxBITMAP_TYPE_BMP).ConvertToBitmap()
+    gif = wxImage(opj('bitmaps/image.gif'), wxBITMAP_TYPE_GIF).ConvertToBitmap()
+    png = wxImage(opj('bitmaps/image.png'), wxBITMAP_TYPE_PNG).ConvertToBitmap()
+    jpg = wxImage(opj('bitmaps/image.jpg'), wxBITMAP_TYPE_JPEG).ConvertToBitmap()
 
     panel = wxPanel(nb, -1)
     pos = 10
 
     panel = wxPanel(nb, -1)
     pos = 10
diff --git a/wxPython/demo/wxMimeTypesManager.py b/wxPython/demo/wxMimeTypesManager.py
index 7c9a03a2c1668118f030a1232881bbc6f855425a..0ad99a74c35085cf0f9d11c825e5e2350d551ac4 100644 (file)
--- a/wxPython/demo/wxMimeTypesManager.py
+++ b/wxPython/demo/wxMimeTypesManager.py
@@ -2,6 +2,7 @@
 import pprint, string, os
 from wxPython.wx import *
 from mimetypes_wdr import *
 import pprint, string, os
 from wxPython.wx import *
 from mimetypes_wdr import *
+from Main import opj
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 
@@ -166,7 +167,7 @@ overview = """\
 import mimetypes_wdr
 
 def MyBitmapsFunc( index ):
 import mimetypes_wdr
 
 def MyBitmapsFunc( index ):
-    return wxImage( "bitmaps/noicon.png", wxBITMAP_TYPE_PNG ).ConvertToBitmap()
+    return wxImage( opj("bitmaps/noicon.png"), wxBITMAP_TYPE_PNG ).ConvertToBitmap()
 
 mimetypes_wdr.MyBitmapsFunc = MyBitmapsFunc
 
 
 mimetypes_wdr.MyBitmapsFunc = MyBitmapsFunc
 
diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index edaf6c8fb9b012603be09c642909e4a6da4b38bb..467f56d604766833618363930bc2377b13e47a6b 100644 (file)
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
 
 from wxPython.wx import *
+from Main import opj
 
 import string
 import images
 
 import string
 import images
@@ -24,7 +25,7 @@ class TestPanel(wxPanel):
         # (lots of colors so it explodes in size and takes a noticable
         # amount of time to convert back to a bitmap.)  So we'll just
         # do it the old way
         # (lots of colors so it explodes in size and takes a noticable
         # amount of time to convert back to a bitmap.)  So we'll just
         # do it the old way
-        bmp = wxBitmap('bitmaps/robin.jpg', wxBITMAP_TYPE_JPEG)
+        bmp = wxBitmap(opj('bitmaps/robin.jpg'), wxBITMAP_TYPE_JPEG)
         wxStaticBitmap(self, -1, bmp, (80, 150))
 
         wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
         wxStaticBitmap(self, -1, bmp, (80, 150))
 
         wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
diff --git a/wxPython/demo/wxWave.py b/wxPython/demo/wxWave.py
index 880d871bc7ef89c509ecee50ac63122b5aa38118..3be8f9e71575bcd4db4cf2a07c522e5820ea823d 100644 (file)
--- a/wxPython/demo/wxWave.py
+++ b/wxPython/demo/wxWave.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
 
 from wxPython.wx import *
+from Main import opj
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
@@ -15,9 +16,9 @@ class TestPanel(wxPanel):
         try:
             import time
             if int(time.time()) % 2 == 1:
         try:
             import time
             if int(time.time()) % 2 == 1:
-                wave = wxWave('data/anykey.wav')
+                wave = wxWave(opj('data/anykey.wav'))
             else:
             else:
-                wave = wxWave('data/plan.wav')
+                wave = wxWave(opj('data/plan.wav'))
             wave.Play()
         except NotImplementedError, v:
             wxMessageBox(str(v), "Exception Message")
             wave.Play()
         except NotImplementedError, v:
             wxMessageBox(str(v), "Exception Message")
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 47ca253c00f7fb505340ed10cf22e8a400b85c87..f224408ece65033255e94f6161e14749c8fa92c4 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -705,6 +705,7 @@ if not GL_ONLY and BUILD_XRC:
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,
+                                '%s/xh_gdctl.cpp' % XMLLOC,
                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,
                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,
diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index e8a04be0ffb9bd90748860519245d31ef1262ef5..497741dcc6286a1d4f1ee81361f798ea37d674d9 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -146,7 +146,7 @@ public:
     wxDC* GetDC();
     int GetCharHeight();
     int GetCharWidth();
     wxDC* GetDC();
     int GetCharHeight();
     int GetCharWidth();
-    wxWindow* GetWindow();
+    wxHtmlWindow* GetWindow();
     //void SetFonts(wxString normal_face, wxString fixed_face, int *LIST);
     %addmethods {
         void SetFonts(wxString normal_face, wxString fixed_face, PyObject* sizes) {
     //void SetFonts(wxString normal_face, wxString fixed_face, int *LIST);
     %addmethods {
         void SetFonts(wxString normal_face, wxString fixed_face, PyObject* sizes) {
diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp
index f624881dc31b0f79f75cd35896086e5b31b5f53a..4c7f47568ede274ef06e4525c3c6197e44521eec 100644 (file)
--- a/wxPython/src/msw/controls2.cpp
+++ b/wxPython/src/msw/controls2.cpp
@@ -10025,25 +10025,23 @@ static PyObject *_wrap_new_wxGenericDirCtrl(PyObject *self, PyObject *args, PyOb
     wxGenericDirCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
     wxGenericDirCtrl * _result;
     wxWindow * _arg0;
     wxWindowID  _arg1 = (wxWindowID ) -1;
-    wxString * _arg2 = (wxString *) &wxDirDialogDefaultFolderStr;
+    char * _arg2 = (char *) wxDirDialogDefaultFolderStr;
     wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg4 = (wxSize *) &wxDefaultSize;
     long  _arg5 = (long ) (wxDIRCTRL_3D_INTERNAL)|wxSUNKEN_BORDER;
     wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg4 = (wxSize *) &wxDefaultSize;
     long  _arg5 = (long ) (wxDIRCTRL_3D_INTERNAL)|wxSUNKEN_BORDER;
-    wxString * _arg6 = (wxString *) &wxEmptyString;
+    char * _arg6 = (char *) wxEmptyString;
     int  _arg7 = (int ) 0;
     char * _arg8 = (char *) "dirCtrl";
     PyObject * _argo0 = 0;
     int  _arg7 = (int ) 0;
     char * _arg8 = (char *) "dirCtrl";
     PyObject * _argo0 = 0;
-    PyObject * _obj2 = 0;
     wxPoint  temp;
     PyObject * _obj3 = 0;
     wxSize  temp0;
     PyObject * _obj4 = 0;
     wxPoint  temp;
     PyObject * _obj3 = 0;
     wxSize  temp0;
     PyObject * _obj4 = 0;
-    PyObject * _obj6 = 0;
     char *_kwnames[] = { "parent","id","dir","pos","size","style","filter","defaultFilter","name", NULL };
     char _ptemp[128];
 
     self = self;
     char *_kwnames[] = { "parent","id","dir","pos","size","style","filter","defaultFilter","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOOlOis:new_wxGenericDirCtrl",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_obj6,&_arg7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|isOOlsis:new_wxGenericDirCtrl",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_arg5,&_arg6,&_arg7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -10052,25 +10050,6 @@ static PyObject *_wrap_new_wxGenericDirCtrl(PyObject *self, PyObject *args, PyOb
         return NULL;
         }
     }
         return NULL;
         }
     }
-    if (_obj2)
-{
-#if PYTHON_API_VERSION >= 1009
-    char* tmpPtr; int tmpSize;
-    if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
-        return NULL;
-    _arg2 = new wxString(tmpPtr, tmpSize);
-#else
-    if (!PyString_Check(_obj2)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
-#endif
-}
     if (_obj3)
 {
     _arg3 = &temp;
     if (_obj3)
 {
     _arg3 = &temp;
@@ -10082,29 +10061,10 @@ static PyObject *_wrap_new_wxGenericDirCtrl(PyObject *self, PyObject *args, PyOb
     _arg4 = &temp0;
     if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
     _arg4 = &temp0;
     if (! wxSize_helper(_obj4, &_arg4))
         return NULL;
-}
-    if (_obj6)
-{
-#if PYTHON_API_VERSION >= 1009
-    char* tmpPtr; int tmpSize;
-    if (!PyString_Check(_obj6) && !PyUnicode_Check(_obj6)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    if (PyString_AsStringAndSize(_obj6, &tmpPtr, &tmpSize) == -1)
-        return NULL;
-    _arg6 = new wxString(tmpPtr, tmpSize);
-#else
-    if (!PyString_Check(_obj6)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg6 = new wxString(PyString_AS_STRING(_obj6), PyString_GET_SIZE(_obj6));
-#endif
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-        _result = (wxGenericDirCtrl *)new_wxGenericDirCtrl(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,_arg7,_arg8);
+        _result = (wxGenericDirCtrl *)new_wxGenericDirCtrl(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,_arg7,_arg8);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
@@ -10115,14 +10075,6 @@ static PyObject *_wrap_new_wxGenericDirCtrl(PyObject *self, PyObject *args, PyOb
         Py_INCREF(Py_None);
         _resultobj = Py_None;
     }
         Py_INCREF(Py_None);
         _resultobj = Py_None;
     }
-{
-    if (_obj2)
-        delete _arg2;
-}
-{
-    if (_obj6)
-        delete _arg6;
-}
     return _resultobj;
 }
 
     return _resultobj;
 }
 
@@ -10159,25 +10111,23 @@ static PyObject *_wrap_wxGenericDirCtrl_Create(PyObject *self, PyObject *args, P
     wxGenericDirCtrl * _arg0;
     wxWindow * _arg1;
     wxWindowID  _arg2 = (wxWindowID ) -1;
     wxGenericDirCtrl * _arg0;
     wxWindow * _arg1;
     wxWindowID  _arg2 = (wxWindowID ) -1;
-    wxString * _arg3 = (wxString *) &wxDirDialogDefaultFolderStr;
+    char * _arg3 = (char *) wxDirDialogDefaultFolderStr;
     wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg5 = (wxSize *) &wxDefaultSize;
     long  _arg6 = (long ) (wxDIRCTRL_3D_INTERNAL)|wxSUNKEN_BORDER;
     wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
     wxSize * _arg5 = (wxSize *) &wxDefaultSize;
     long  _arg6 = (long ) (wxDIRCTRL_3D_INTERNAL)|wxSUNKEN_BORDER;
-    wxString * _arg7 = (wxString *) &wxEmptyString;
+    char * _arg7 = (char *) wxEmptyString;
     int  _arg8 = (int ) 0;
     char * _arg9 = (char *) "dirCtrl";
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     int  _arg8 = (int ) 0;
     char * _arg9 = (char *) "dirCtrl";
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
-    PyObject * _obj3 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     wxSize  temp0;
     PyObject * _obj5 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     wxSize  temp0;
     PyObject * _obj5 = 0;
-    PyObject * _obj7 = 0;
     char *_kwnames[] = { "self","parent","id","dir","pos","size","style","filter","defaultFilter","name", NULL };
 
     self = self;
     char *_kwnames[] = { "self","parent","id","dir","pos","size","style","filter","defaultFilter","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOOOlOis:wxGenericDirCtrl_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_obj5,&_arg6,&_obj7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|isOOlsis:wxGenericDirCtrl_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_obj4,&_obj5,&_arg6,&_arg7,&_arg8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -10193,25 +10143,6 @@ static PyObject *_wrap_wxGenericDirCtrl_Create(PyObject *self, PyObject *args, P
         return NULL;
         }
     }
         return NULL;
         }
     }
-    if (_obj3)
-{
-#if PYTHON_API_VERSION >= 1009
-    char* tmpPtr; int tmpSize;
-    if (!PyString_Check(_obj3) && !PyUnicode_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    if (PyString_AsStringAndSize(_obj3, &tmpPtr, &tmpSize) == -1)
-        return NULL;
-    _arg3 = new wxString(tmpPtr, tmpSize);
-#else
-    if (!PyString_Check(_obj3)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3));
-#endif
-}
     if (_obj4)
 {
     _arg4 = &temp;
     if (_obj4)
 {
     _arg4 = &temp;
@@ -10223,41 +10154,14 @@ static PyObject *_wrap_wxGenericDirCtrl_Create(PyObject *self, PyObject *args, P
     _arg5 = &temp0;
     if (! wxSize_helper(_obj5, &_arg5))
         return NULL;
     _arg5 = &temp0;
     if (! wxSize_helper(_obj5, &_arg5))
         return NULL;
-}
-    if (_obj7)
-{
-#if PYTHON_API_VERSION >= 1009
-    char* tmpPtr; int tmpSize;
-    if (!PyString_Check(_obj7) && !PyUnicode_Check(_obj7)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    if (PyString_AsStringAndSize(_obj7, &tmpPtr, &tmpSize) == -1)
-        return NULL;
-    _arg7 = new wxString(tmpPtr, tmpSize);
-#else
-    if (!PyString_Check(_obj7)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg7 = new wxString(PyString_AS_STRING(_obj7), PyString_GET_SIZE(_obj7));
-#endif
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-        _result = (bool )wxGenericDirCtrl_Create(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,*_arg7,_arg8,_arg9);
+        _result = (bool )wxGenericDirCtrl_Create(_arg0,_arg1,_arg2,_arg3,*_arg4,*_arg5,_arg6,_arg7,_arg8,_arg9);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }    _resultobj = Py_BuildValue("i",_result);
-{
-    if (_obj3)
-        delete _arg3;
-}
-{
-    if (_obj7)
-        delete _arg7;
-}
     return _resultobj;
 }
 
     return _resultobj;
 }
 
diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp
index 654e82277acd1e85388c8a4ee3ca4276bff8cd0f..ecba04ab38c7449e978a41f7c3dc24f529a0522d 100644 (file)
--- a/wxPython/src/msw/html.cpp
+++ b/wxPython/src/msw/html.cpp
@@ -1495,7 +1495,7 @@ static PyObject *_wrap_wxHtmlWinParser_GetCharWidth(PyObject *self, PyObject *ar
 #define wxHtmlWinParser_GetWindow(_swigobj)  (_swigobj->GetWindow())
 static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
 #define wxHtmlWinParser_GetWindow(_swigobj)  (_swigobj->GetWindow())
 static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
-    wxWindow * _result;
+    wxHtmlWindow * _result;
     wxHtmlWinParser * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
     wxHtmlWinParser * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
@@ -1512,7 +1512,7 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args,
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-        _result = (wxWindow *)wxHtmlWinParser_GetWindow(_arg0);
+        _result = (wxHtmlWindow *)wxHtmlWinParser_GetWindow(_arg0);
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 0fcf295e4a909cba68717f938d7eeb104966dfc1..f27dc7dc9a15cf511522ce8b2b18c24a7aedbbe4 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -391,6 +391,7 @@
 %typemap(python, out) wxToolBar*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBar*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxHtmlWindow*             { $target = wxPyMake_wxObject($source); }
 
 %typemap(python, out) wxSizer*                  { $target = wxPyMake_wxSizer($source); }
 
 
 %typemap(python, out) wxSizer*                  { $target = wxPyMake_wxSizer($source); }
 
wxWidgets (Impactor)