X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0812732316f715a480526cedcd481e7fc31a130c..dafb483b3a1f273e79bae8cbc7eb0bab2387239b:/utils/wxPython/src/wx.i diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i index 4d4c8f1b51..70535f3d1e 100644 --- a/utils/wxPython/src/wx.i +++ b/utils/wxPython/src/wx.i @@ -25,7 +25,10 @@ %include my_typemaps.i %include _defs.i +%include pointer.i + %import misc.i +%import misc2.i %import windows.i %import events.i %import gdi.i @@ -37,9 +40,9 @@ %import stattool.i %import frames.i %import windows3.i -#ifndef SEPARATE -%import utils.i -#endif +%import image.i +%import printfw.i +%import sizers.i %native(_wxStart) __wxStart; @@ -47,7 +50,8 @@ //--------------------------------------------------------------------------- -#define __version__ "0.5.3" + +#define __version__ "0.0.0" // The real value is now in build.py... wxPoint wxPyDefaultPosition; wxSize wxPyDefaultSize; @@ -64,6 +68,7 @@ public: } } + ~wxPyApp(); wxString GetAppName(); #ifdef __WXMSW__ @@ -80,6 +85,7 @@ public: bool Initialized(); int MainLoop(); bool Pending(); + bool ProcessIdle(); void SetAppName(const wxString& name); #ifdef __WXMSW__ @@ -91,40 +97,51 @@ public: void SetTopWindow(wxWindow* window); void SetVendorName(const wxString& name); - // This one is wxPython specific. If you override MainLoop, - // call this when done. - void AfterMainLoop(); + wxIcon GetStdIcon(int which); + + }; +//---------------------------------------------------------------------- +// this is used to cleanup after wxWindows when Python shuts down. + +%inline %{ + void wxApp_CleanUp() { + wxApp::CleanUp(); + } +%} //---------------------------------------------------------------------- // This code gets added to the module initialization function //---------------------------------------------------------------------- %{ -extern "C" SWIGEXPORT(void,initwindowsc)(); -extern "C" SWIGEXPORT(void,initwindows2c)(); -extern "C" SWIGEXPORT(void,initeventsc)(); -extern "C" SWIGEXPORT(void,initmiscc)(); -extern "C" SWIGEXPORT(void,initgdic)(); -extern "C" SWIGEXPORT(void,initmdic)(); -extern "C" SWIGEXPORT(void,initcontrolsc)(); -extern "C" SWIGEXPORT(void,initcontrols2c)(); -extern "C" SWIGEXPORT(void,initcmndlgsc)(); -extern "C" SWIGEXPORT(void,initstattoolc)(); -extern "C" SWIGEXPORT(void,initframesc)(); -extern "C" SWIGEXPORT(void,initutilsc)(); -extern "C" SWIGEXPORT(void,initwindows3c)(); +extern "C" SWIGEXPORT(void) initwindowsc(); +extern "C" SWIGEXPORT(void) initwindows2c(); +extern "C" SWIGEXPORT(void) initeventsc(); +extern "C" SWIGEXPORT(void) initmiscc(); +extern "C" SWIGEXPORT(void) initmisc2c(); +extern "C" SWIGEXPORT(void) initgdic(); +extern "C" SWIGEXPORT(void) initmdic(); +extern "C" SWIGEXPORT(void) initcontrolsc(); +extern "C" SWIGEXPORT(void) initcontrols2c(); +extern "C" SWIGEXPORT(void) initcmndlgsc(); +extern "C" SWIGEXPORT(void) initstattoolc(); +extern "C" SWIGEXPORT(void) initframesc(); +extern "C" SWIGEXPORT(void) initwindows3c(); +extern "C" SWIGEXPORT(void) initimagec(); +extern "C" SWIGEXPORT(void) initprintfwc(); +extern "C" SWIGEXPORT(void) initsizersc(); +extern "C" SWIGEXPORT(void) initclip_dndc(); +%} -%} %init %{ __wxPreStart(); // initialize the GUI toolkit, if needed. -// wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100); // Since these modules are all linked together, initialize them now // because python won't be able to find their shared library files, @@ -133,6 +150,7 @@ extern "C" SWIGEXPORT(void,initwindows3c)(); initwindows2c(); initeventsc(); initmiscc(); + initmisc2c(); initgdic(); initmdic(); initcontrolsc(); @@ -141,9 +159,10 @@ extern "C" SWIGEXPORT(void,initwindows3c)(); initstattoolc(); initframesc(); initwindows3c(); -#ifndef SEPARATE - initutilsc(); -#endif + initimagec(); + initprintfwc(); + initsizersc(); + initclip_dndc(); %} //---------------------------------------------------------------------- @@ -153,79 +172,3 @@ extern "C" SWIGEXPORT(void,initwindows3c)(); %pragma(python) include="_extras.py"; -///////////////////////////////////////////////////////////////////////////// -// -// $Log$ -// Revision 1.4 1999/01/30 07:30:16 RD -// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc. -// -// Various cleanup, tweaks, minor additions, etc. to maintain -// compatibility with the current wxWindows. -// -// Revision 1.3 1998/12/17 17:52:21 RD -// -// wxPython 0.5.2 -// Minor fixes and SWIG code generation for RR's changes. MSW and GTK -// versions are much closer now! -// -// Revision 1.2 1998/12/16 22:10:57 RD -// -// Tweaks needed to be able to build wxPython with wxGTK. -// -// Revision 1.1 1998/12/15 20:41:27 RD -// Changed the import semantics from "from wxPython import *" to "from -// wxPython.wx import *" This is for people who are worried about -// namespace pollution, they can use "from wxPython import wx" and then -// prefix all the wxPython identifiers with "wx." -// -// Added wxTaskbarIcon for wxMSW. -// -// Made the events work for wxGrid. -// -// Added wxConfig. -// -// Added wxMiniFrame for wxGTK, (untested.) -// -// Changed many of the args and return values that were pointers to gdi -// objects to references to reflect changes in the wxWindows API. -// -// Other assorted fixes and additions. -// -// Revision 1.9 1998/10/20 07:38:04 RD -// bug fix -// -// Revision 1.8 1998/10/07 07:34:35 RD -// Version 0.4.1 for wxGTK -// -// Revision 1.7 1998/10/02 06:40:44 RD -// -// Version 0.4 of wxPython for MSW. -// -// Revision 1.6 1998/08/27 21:59:10 RD -// Some chicken-and-egg problems solved for wxPython on wxGTK -// -// Revision 1.5 1998/08/27 00:00:28 RD -// - more tweaks -// - have discovered some problems but not yet discovered solutions... -// -// Revision 1.4 1998/08/18 19:48:20 RD -// more wxGTK compatibility things. -// -// It builds now but there are serious runtime problems... -// -// Revision 1.3 1998/08/15 07:36:53 RD -// - Moved the header in the .i files out of the code that gets put into -// the .cpp files. It caused CVS conflicts because of the RCS ID being -// different each time. -// -// - A few minor fixes. -// -// Revision 1.2 1998/08/14 23:36:49 RD -// Beginings of wxGTK compatibility -// -// Revision 1.1 1998/08/09 08:25:53 RD -// Initial version -// -// - -