wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -54,9 +54,6 @@
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
||||
#define __version__ "0.0.0" // The real value is now in setup.py...
|
||||
|
||||
%readonly
|
||||
wxPoint wxDefaultPosition;
|
||||
wxSize wxDefaultSize;
|
||||
@@ -287,17 +284,12 @@ static wxPyCoreAPI API = {
|
||||
initfontsc();
|
||||
|
||||
|
||||
// Although these are redfined in __version__ they need to be here too so
|
||||
// that an assert can be done to ensure that the wxPython and the wxWindows
|
||||
// versions match.
|
||||
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
|
||||
PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION ));
|
||||
PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER ));
|
||||
PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
|
||||
#if wxUSE_UNICODE
|
||||
wxString tempStr(wxVERSION_STRING);
|
||||
PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromWideChar(tempStr.c_str(), tempStr.Len()));
|
||||
#else
|
||||
PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
|
||||
#endif
|
||||
|
||||
PyDict_SetItemString(d,"wxRELEASE_VERSION", PyInt_FromLong((long)wxRELEASE_NUMBER ));
|
||||
|
||||
%}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user