simplified definition

[wxWidgets.git] / wxPython / src / wx.i

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 7497d86703c5d353c40825f7ce0a222887f99ecd..747fa6839e1847d4102a1e3ee41dd9d3bde7f101 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wxp.i
+// Name:        wx.i

 // Purpose:     SWIG interface file for a python wxWindows module
 //
 // Author:      Robin Dunn
 // Purpose:     SWIG interface file for a python wxWindows module
 //
 // Author:      Robin Dunn


@@ -12,11 +12,11 @@
 
 %module wx
 
 
 %module wx
 

+

 %{
 #include "helpers.h"
 %}
 
 %{
 #include "helpers.h"
 %}
 

-

 //----------------------------------------------------------------------
 // This is where we include the other wrapper definition files for SWIG
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // This is where we include the other wrapper definition files for SWIG
 //----------------------------------------------------------------------


@@ -46,6 +46,8 @@
 %import streams.i
 %import filesys.i
 %import utils.i
 %import streams.i
 %import filesys.i
 %import utils.i

+%import fonts.i
+

 
 %native(_wxStart)           __wxStart;
 %native(_wxSetDictionary)   __wxSetDictionary;
 
 %native(_wxStart)           __wxStart;
 %native(_wxSetDictionary)   __wxSetDictionary;


@@ -63,6 +65,14 @@ wxSize      wxDefaultSize;
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 

+enum {
+    wxPYAPP_ASSERT_SUPPRESS  = 1,
+    wxPYAPP_ASSERT_EXCEPTION = 2,
+    wxPYAPP_ASSERT_DIALOG    = 4,
+    wxPYAPP_ASSERT_LOG       = 8
+};
+
+

 class wxPyApp : public wxEvtHandler {
 public:
     %addmethods {
 class wxPyApp : public wxEvtHandler {
 public:
     %addmethods {


@@ -74,6 +84,11 @@ public:
 
     ~wxPyApp();
 
 
     ~wxPyApp();
 

+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyApp)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
+

     wxString GetAppName();
 #ifdef __WXMSW__
     bool GetAuto3D();
     wxString GetAppName();
 #ifdef __WXMSW__
     bool GetAuto3D();


@@ -91,6 +106,7 @@ public:
     int  MainLoop();
     bool Pending();
     bool ProcessIdle();
     int  MainLoop();
     bool Pending();
     bool ProcessIdle();

+    bool Yield(bool onlyIfNeeded = FALSE);

 
     void SetAppName(const wxString& name);
 #ifdef __WXMSW__
 
     void SetAppName(const wxString& name);
 #ifdef __WXMSW__


@@ -102,17 +118,34 @@ public:
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
     void SetUseBestVisual(bool flag);
     void SetTopWindow(wxWindow* window);
     void SetVendorName(const wxString& name);
     void SetUseBestVisual(bool flag);

-    wxIcon GetStdIcon(int which);
+
+    int  GetAssertMode();
+    void SetAssertMode(int mode);
+
+
+    static bool GetMacDefaultEncodingIsPC();
+    static bool GetMacSupportPCMenuShortcuts();
+    static long GetMacAboutMenuItemId();
+    static long GetMacPreferencesMenuItemId();
+    static long GetMacExitMenuItemId();
+    static wxString GetMacHelpMenuTitleName();
+
+    static void SetMacDefaultEncodingIsPC(bool val);
+    static void SetMacSupportPCMenuShortcuts(bool val);
+    static void SetMacAboutMenuItemId(long val);
+    static void SetMacPreferencesMenuItemId(long val);
+    static void SetMacExitMenuItemId(long val);
+    static void SetMacHelpMenuTitleName(const wxString& val);

 };
 
 %inline %{
     wxPyApp* wxGetApp() {
 };
 
 %inline %{
     wxPyApp* wxGetApp() {

-        return wxPythonApp;
+        //return wxPythonApp;
+        return (wxPyApp*)wxTheApp;

     }
 %}
 
 
     }
 %}
 
 

-

 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 


@@ -149,6 +182,7 @@ 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) initstreamsc();
 extern "C" SWIGEXPORT(void) initfilesysc();
 extern "C" SWIGEXPORT(void) initutilsc();

+extern "C" SWIGEXPORT(void) initfontsc();

 
 
 
 
 
 


@@ -156,12 +190,12 @@ extern "C" SWIGEXPORT(void) initutilsc();
 // the wxc module and will then have safe access to these functions, even if
 // in another shared library.
 static wxPyCoreAPI API = {
 // 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,
+    (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,
 
     wxPyBeginAllowThreads,
     wxPyEndAllowThreads,


@@ -189,6 +223,7 @@ static wxPyCoreAPI API = {
     wxRealPoint_helper,
     wxRect_helper,
     wxColour_helper,
     wxRealPoint_helper,
     wxRect_helper,
     wxColour_helper,

+    wxPoint2DDouble_helper,

 
     wxPyCBH_setCallbackInfo,
     wxPyCBH_findCallback,
 
     wxPyCBH_setCallbackInfo,
     wxPyCBH_findCallback,


@@ -201,7 +236,13 @@ static wxPyCoreAPI API = {
     wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,
     wxArrayString2PyList_helper,
     wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,
     wxArrayString2PyList_helper,

-    wxArrayInt2PyList_helper
+    wxArrayInt2PyList_helper,
+
+    wxPyClientData_dtor,
+    wxPyUserData_dtor,
+    wxPyOORClientData_dtor,
+
+    wxPyCBInputStream_create

 };
 
 
 };
 
 


@@ -217,7 +258,7 @@ static wxPyCoreAPI API = {
     Py_XDECREF(v);
 
 
     Py_XDECREF(v);
 
 

-    __wxPreStart();     // initialize the GUI toolkit, if needed.
+    __wxPreStart(d);     // initialize the GUI toolkit, if needed.

 
 
         // Since these modules are all linked together, initialize them now
 
 
         // Since these modules are all linked together, initialize them now


@@ -243,6 +284,7 @@ static wxPyCoreAPI API = {
     initstreamsc();
     initfilesysc();
     initutilsc();
     initstreamsc();
     initfilesysc();
     initutilsc();

+    initfontsc();

 
 
     PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
 
 
     PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));


@@ -251,7 +293,7 @@ static wxPyCoreAPI API = {
     PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
 #if wxUSE_UNICODE
     wxString tempStr(wxVERSION_STRING);
     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()));
+    PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromWideChar(tempStr.c_str(), tempStr.Len()));

 #else
     PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
 #endif
 #else
     PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
 #endif