Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gave up on generating a warning upon the use of the old true/false or

Browse Source 
TRUE/FALSE values.

Fixed the typemap that converts strings to wxColours to also accept
unicode.

Typo fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-19 03:45:44 +00:00
parent 80977b9444
commit 375c124f0d
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wxPython/src/_extras.py
View File

@@ -632,23 +632,9 @@ except NameError:
True = 1==1 True = 1==1
False = 1==0 False = 1==0
class _DeprecatedNonBool: # Backwards compaatible
def __init__(self, val, txt): TRUE = true = True
self.__val = val FALSE = false = False
self.__txt = txt
def __int__(self):
import warnings
warnings.warn("Use Python's %s instead" % self.__txt, DeprecationWarning, 3)
return self.__val
def __nonzero__(self):
return self.__int__()
def __repr__(self):
if self.__val: text = "True"
else: text = "False"
return "_DeprecatedNonBool: %s" % text
TRUE = true = _DeprecatedNonBool(True, 'True')
FALSE = false = _DeprecatedNonBool(False, 'False')
#---------------------------------------------------------------------- #----------------------------------------------------------------------

6
wxPython/src/helpers.cpp
View File

@@ -141,7 +141,7 @@ bool wxPyApp::OnInitGui() {
// wxPyBeginBlockThreads(); *** only called from within __wxStart so we already have the GIL // wxPyBeginBlockThreads(); *** only called from within __wxStart so we already have the GIL
if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
// wxPyEndBlockThreads(); // wxPyEndBlockThreads(); ***
return rval; return rval;
} }
@@ -2225,8 +2225,8 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
return TRUE; return TRUE;
} }
// otherwise a string is expected // otherwise a string is expected
else if (PyString_Check(source)) { else if (PyString_Check(source) || PyUnicode_Check(source)) {
wxString spec(PyString_AS_STRING(source), *wxConvCurrent); wxString spec = Py2wxString(source);
if (spec.GetChar(0) == '#' && spec.Length() == 7) { // It's #RRGGBB if (spec.GetChar(0) == '#' && spec.Length() == 7) { // It's #RRGGBB
long red, green, blue; long red, green, blue;
red = green = blue = 0; red = green = blue = 0;

2
wxPython/src/utils.i
View File

@@ -772,7 +772,7 @@ public:
return self.__sub__DT(other) return self.__sub__DT(other)
if isinstance(other, wxTimeSpanPtr): if isinstance(other, wxTimeSpanPtr):
return self.__sub__TS(other) return self.__sub__TS(other)
if isinstnace(other, wxDateSpanPtr): if isinstance(other, wxDateSpanPtr):
return self.__sub__DS(other) return self.__sub__DS(other)
raise TypeError, 'Invalid r.h.s. type for __sub__' raise TypeError, 'Invalid r.h.s. type for __sub__'
" "