Better error message, flags --> style in wxHtmlWindow, etc.

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

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 1b820fc7132b20b3a5a6bc5aba08272d46e06525..9949c377d11353486f99b1f57c2aab5f3d099e7c 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -168,6 +168,7 @@ if UNICODE and os.name != 'nt':
 
 if UNICODE:
     BUILD_BASE = BUILD_BASE + '.unicode'
+    VERSION = VERSION + 'u'
 
 
 #----------------------------------------------------------------------

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index d90b2a39f94d3e0667b40c14fda9409b8f67b740..9e22cad5f27b11578ad5164394c712d4980db080 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -659,7 +659,7 @@ class _wxPyDeadObject:
     prevent crashes due to referencing a bogus C++ pointer.
     """
     reprStr = "wxPython wrapper for DELETED %s object! (The C++ object no longer exists.)"
-    attrStr = "The C++ %s object has been deleted, attribute access no longer allowed."
+    attrStr = "The C++ part of the %s object has been deleted, attribute access no longer allowed."
 
     def __repr__( self ):
         if not hasattr(self, "_name"):

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 506e999c0829df6b10bf74d44ec690e4d8c019bd..9fc0835024d2b13c3da6083854fc7e366ba7f556 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -546,14 +546,14 @@ public:
     wxPyHtmlWindow(wxWindow *parent, int id = -1,
                  wxPoint& pos = wxDefaultPosition,
                  wxSize& size = wxDefaultSize,
-                 int flags=wxHW_SCROLLBAR_AUTO,
+                 int style=wxHW_SCROLLBAR_AUTO,
                  const wxString& name = wxPyHtmlWindowNameStr);
     %name(wxPreHtmlWindow)wxPyHtmlWindow();
 
     bool Create(wxWindow *parent, int id = -1,
                 wxPoint& pos = wxDefaultPosition,
                 wxSize& size = wxDefaultSize,
-                int flags=wxHW_SCROLLBAR_AUTO,
+                int style=wxHW_SCROLLBAR_AUTO,
                 const wxString& name = wxPyHtmlWindowNameStr);
 
 

diff --git a/wxPython/src/msw/html.cpp b/wxPython/src/msw/html.cpp
index ddc738085486afe9c2ed591d0574586e8c941edb..e56500ea412302507a16a9a6cb386b2f08be16c3 100644 (file)
--- a/wxPython/src/msw/html.cpp
+++ b/wxPython/src/msw/html.cpp
@@ -4066,7 +4066,7 @@ static PyObject *_wrap_new_wxHtmlWindow(PyObject *self, PyObject *args, PyObject
     wxSize  temp0;
     PyObject * _obj3 = 0;
     PyObject * _obj5 = 0;
-    char *_kwnames[] = { "parent","id","pos","size","flags","name", NULL };
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
@@ -4161,7 +4161,7 @@ static PyObject *_wrap_wxHtmlWindow_Create(PyObject *self, PyObject *args, PyObj
     wxSize  temp0;
     PyObject * _obj4 = 0;
     PyObject * _obj6 = 0;
-    char *_kwnames[] = { "self","parent","id","pos","size","flags","name", NULL };
+    char *_kwnames[] = { "self","parent","id","pos","size","style","name", NULL };
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOOiO:wxHtmlWindow_Create",_kwnames,&_argo0,&_argo1,&_arg2,&_obj3,&_obj4,&_arg5,&_obj6)) 

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 98c8598aeedaccee9fcaf0b82bdddaf42a52613c..b6c74e105f3215d3cfc34fd62b07939e32a65b0d 100644 (file)
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -1567,7 +1567,7 @@ class _wxPyDeadObject:
     prevent crashes due to referencing a bogus C++ pointer.
     """
     reprStr = "wxPython wrapper for DELETED %s object! (The C++ object no longer exists.)"
-    attrStr = "The C++ %s object has been deleted, attribute access no longer allowed."
+    attrStr = "The C++ part of the %s object has been deleted, attribute access no longer allowed."
 
     def __repr__( self ):
         if not hasattr(self, "_name"):

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 27d5a3d51a43db186df05acb31f49daacbef2a4e..351c6e4bb1812c8c4f46d592f4e92c35f1b70029 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,7 +12,6 @@
 
 %module wx
 
-
 %{
 #include "helpers.h"
 %}