From: Robin Dunn <robin@alldunn.com>
Date: Thu, 11 Apr 2002 23:13:29 +0000 (+0000)
Subject: Better error message, flags --> style in wxHtmlWindow, etc.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fc51b8c37ea65b33ccc00e6d0c94a8400c14a843?ds=sidebyside

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 1b820fc713..9949c377d1 100755
--- 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 d90b2a39f9..9e22cad5f2 100644
--- 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 506e999c08..9fc0835024 100644
--- 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 ddc7380854..e56500ea41 100644
--- 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 98c8598aee..b6c74e105f 100644
--- 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 27d5a3d51a..351c6e4bb1 100644
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,7 +12,6 @@
 
 %module wx
 
-
 %{
 #include "helpers.h"
 %}