%import sizers.i
%import streams.i
%import filesys.i
+%import utils.i
+%import fonts.i
+
%native(_wxStart) __wxStart;
%native(_wxSetDictionary) __wxSetDictionary;
void SetTopWindow(wxWindow* window);
void SetVendorName(const wxString& name);
void SetUseBestVisual(bool flag);
- wxIcon GetStdIcon(int which);
-
-
};
%inline %{
wxPyApp* wxGetApp() {
- return wxPythonApp;
+ //return wxPythonApp;
+ return (wxPyApp*)wxTheApp;
}
%}
+
//----------------------------------------------------------------------
// this is used to cleanup after wxWindows when Python shuts down.
extern "C" SWIGEXPORT(void) initclip_dndc();
extern "C" SWIGEXPORT(void) initstreamsc();
extern "C" SWIGEXPORT(void) initfilesysc();
+extern "C" SWIGEXPORT(void) initutilsc();
+extern "C" SWIGEXPORT(void) initfontsc();
// the wxc module and will then have safe access to these functions, even if
// in another shared library.
static wxPyCoreAPI API = {
- SWIG_MakePtr,
- SWIG_GetPtr,
- SWIG_GetPtrObj,
- SWIG_RegisterMapping,
- SWIG_addvarlink,
- SWIG_newvarlink,
-
- wxPySaveThread,
- wxPyRestoreThread,
+ (p_SWIG_MakePtr_t)SWIG_MakePtr,
+ (p_SWIG_GetPtr_t)SWIG_GetPtr,
+ (p_SWIG_GetPtrObj_t)SWIG_GetPtrObj,
+ (p_SWIG_RegisterMapping_t)SWIG_RegisterMapping,
+ (p_SWIG_addvarlink_t)SWIG_addvarlink,
+ (p_SWIG_newvarlink_t)SWIG_newvarlink,
+
+ wxPyBeginAllowThreads,
+ wxPyEndAllowThreads,
+ wxPyBeginBlockThreads,
+ wxPyEndBlockThreads,
+
wxPyConstructObject,
wxPy_ConvertList,
+ wxString_in_helper,
+ Py2wxString,
+ wx2PyString,
+
byte_LIST_helper,
int_LIST_helper,
long_LIST_helper,
wxRect_helper,
wxColour_helper,
- wxPyCBH_setSelf,
+ wxPyCBH_setCallbackInfo,
wxPyCBH_findCallback,
wxPyCBH_callCallback,
wxPyCBH_callCallbackObj,
wxPyCBH_delete,
+
+ wxPyClassExists,
+ wxPyMake_wxObject,
+ wxPyMake_wxSizer,
+ wxPyPtrTypeMap_Add,
+ wxArrayString2PyList_helper,
+ wxArrayInt2PyList_helper,
+
+ wxPyClientData_dtor,
+ wxPyUserData_dtor,
+ wxPyOORClientData_dtor
};
+
%}
initclip_dndc();
initstreamsc();
initfilesysc();
+ initutilsc();
+ initfontsc();
+
+
+ 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_FromUnicode(tempStr.c_str(), tempStr.Len()));
+#else
+ PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
+#endif
+
%}
%pragma(python) include="_extras.py";
-