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

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
if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
// wxPyEndBlockThreads();
// wxPyEndBlockThreads(); ***
return rval;
}
@@ -2225,8 +2225,8 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
return TRUE;
}
// otherwise a string is expected
else if (PyString_Check(source)) {
wxString spec(PyString_AS_STRING(source), *wxConvCurrent);
else if (PyString_Check(source) || PyUnicode_Check(source)) {
wxString spec = Py2wxString(source);
if (spec.GetChar(0) == '#' && spec.Length() == 7) { // It's #RRGGBB
long red, green, blue;
red = green = blue = 0;