SWIGged updates for wxGTK

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index ef93904448eec59341075aafa4a646739f16bbcc..8fd676350a13112dc333dbba7c5c57f2a11b9151 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -468,6 +468,9 @@ IMP_PYCALLBACK_STRING__pure( wxPyTipProvider, wxTipProvider, GetTip);
 class wxPyTipProvider : public wxTipProvider {
 public:
     wxPyTipProvider(size_t currentTip);
 class wxPyTipProvider : public wxTipProvider {
 public:
     wxPyTipProvider(size_t currentTip);

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

 };
 
 
 };
 
 


@@ -563,6 +566,27 @@ enum
     wxLOG_User = 100  // user defined levels start here
 };
 
     wxLOG_User = 100  // user defined levels start here
 };
 

+#define wxTRACE_MemAlloc "memalloc" // trace memory allocation (new/delete)
+#define wxTRACE_Messages "messages" // trace window messages/X callbacks
+#define wxTRACE_ResAlloc "resalloc" // trace GDI resource allocation
+#define wxTRACE_RefCount "refcount" // trace various ref counting operations
+
+#ifdef  __WXMSW__
+#define wxTRACE_OleCalls "ole"      // OLE interface calls
+#endif
+
+enum {
+    wxTraceMemAlloc,
+    wxTraceMessages,
+    wxTraceResAlloc,
+    wxTraceRefCount,
+
+#ifdef  __WXMSW__
+    wxTraceOleCalls,
+#endif
+};
+
+

 
 class wxLog
 {
 
 class wxLog
 {


@@ -571,7 +595,7 @@ public:
 
     static bool IsEnabled();
     static bool EnableLogging(bool doIt = TRUE);
 
     static bool IsEnabled();
     static bool EnableLogging(bool doIt = TRUE);

-    static void OnLog(wxLogLevel level, const wxString& szString, int t=0);
+    static void OnLog(unsigned long level, const wxString& szString, int t=0);

 
     virtual void Flush();
     bool HasPendingMessages() const;
 
     virtual void Flush();
     bool HasPendingMessages() const;


@@ -586,7 +610,7 @@ public:
     static void SetVerbose(bool bVerbose = TRUE);
 
     static void DontCreateOnDemand();
     static void SetVerbose(bool bVerbose = TRUE);
 
     static void DontCreateOnDemand();

-    static void SetTraceMask(wxTraceMask ulMask);
+    static void SetTraceMask(long ulMask);

     static void AddTraceMask(const wxString& str);
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();
     static void AddTraceMask(const wxString& str);
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();


@@ -596,7 +620,7 @@ public:
 
     bool GetVerbose() const;
 
 
     bool GetVerbose() const;
 

-    static wxTraceMask GetTraceMask();
+    static unsigned long GetTraceMask();

     static bool IsAllowedTraceMask(const wxString& mask);
 
     // static void TimeStamp(wxString *str);
     static bool IsAllowedTraceMask(const wxString& mask);
 
     // static void TimeStamp(wxString *str);


@@ -660,15 +684,20 @@ public:
 
 unsigned long wxSysErrorCode();
 const wxString wxSysErrorMsg(unsigned long nErrCode = 0);
 
 unsigned long wxSysErrorCode();
 const wxString wxSysErrorMsg(unsigned long nErrCode = 0);

-void wxLogFatalError(const wxString& szFormat);
-void wxLogError(const wxString& szFormat);
-void wxLogWarning(const wxString& szFormat);
-void wxLogMessage(const wxString& szFormat);
-void wxLogInfo(const wxString& szFormat);
-void wxLogVerbose(const wxString& szFormat);
-void wxLogStatus(const wxString& szFormat);
-%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
-void wxLogSysError(const wxString& szFormat);
+void wxLogFatalError(const wxString& msg);
+void wxLogError(const wxString& msg);
+void wxLogWarning(const wxString& msg);
+void wxLogMessage(const wxString& msg);
+void wxLogInfo(const wxString& msg);
+void wxLogVerbose(const wxString& msg);
+void wxLogStatus(const wxString& msg);
+%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
+void wxLogSysError(const wxString& msg);
+
+void wxLogTrace(const wxString& msg);
+%name(wxLogTraceMask)void wxLogTrace(const wxString& mask, const wxString& msg);
+
+void wxLogGeneric(unsigned long level, const wxString& msg);

 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash


@@ -737,12 +766,47 @@ public:
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
 

+enum wxKillError
+{
+    wxKILL_OK,              // no error
+    wxKILL_BAD_SIGNAL,      // no such signal
+    wxKILL_ACCESS_DENIED,   // permission denied
+    wxKILL_NO_PROCESS,      // no such process
+    wxKILL_ERROR            // another, unspecified error
+};
+
+enum wxSignal
+{
+    wxSIGNONE = 0,  // verify if the process exists under Unix
+    wxSIGHUP,
+    wxSIGINT,
+    wxSIGQUIT,
+    wxSIGILL,
+    wxSIGTRAP,
+    wxSIGABRT,
+    wxSIGIOT = wxSIGABRT,   // another name
+    wxSIGEMT,
+    wxSIGFPE,
+    wxSIGKILL,
+    wxSIGBUS,
+    wxSIGSEGV,
+    wxSIGSYS,
+    wxSIGPIPE,
+    wxSIGALRM,
+    wxSIGTERM
+
+    // further signals are different in meaning between different Unix systems
+};
+
+
+

 enum {
     /* event type */
     wxEVT_END_PROCESS
 };
 
 
 enum {
     /* event type */
     wxEVT_END_PROCESS
 };
 
 

+

 class wxProcessEvent : public wxEvent {
 public:
     wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0);
 class wxProcessEvent : public wxEvent {
 public:
     wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0);


@@ -774,6 +838,23 @@ IMP_PYCALLBACK_VOID_INTINT( wxPyProcess, wxProcess, OnTerminate);
 
 %name(wxProcess)class wxPyProcess : public wxEvtHandler {
 public:
 
 %name(wxProcess)class wxPyProcess : public wxEvtHandler {
 public:

+    // kill the process with the given PID
+    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM);
+
+    // test if the given process exists
+    static bool Exists(int pid);
+
+    // this function replaces the standard popen() one: it launches a process
+    // asynchronously and allows the caller to get the streams connected to its
+    // std{in|out|err}
+    //
+    // on error NULL is returned, in any case the process object will be
+    // deleted automatically when the process terminates and should *not* be
+    // deleted by the caller
+    static wxPyProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC);
+
+
+

     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
     %addmethods { void Destroy() { delete self; } }
 
     wxPyProcess(wxEvtHandler *parent = NULL, int id = -1);
     %addmethods { void Destroy() { delete self; } }
 


@@ -791,6 +872,13 @@ public:
     wxOutputStream *GetOutputStream();
 
     void CloseOutput();
     wxOutputStream *GetOutputStream();
 
     void CloseOutput();

+
+    // return TRUE if the child process stdout is not closed
+    bool IsInputOpened() const;
+
+    // return TRUE if any input is available on the child process stdout/err
+    bool IsInputAvailable() const;
+    bool IsErrorAvailable() const;

 };
 
 
 };
 
 


@@ -818,6 +906,25 @@ long wxExecute(const wxString& command,
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+
+// Which joystick? Same as Windows ids so no conversion necessary.
+enum
+{
+    wxJOYSTICK1,
+    wxJOYSTICK2
+};
+
+// Which button is down?
+enum
+{
+    wxJOY_BUTTON_ANY,
+    wxJOY_BUTTON1,
+    wxJOY_BUTTON2,
+    wxJOY_BUTTON3,
+    wxJOY_BUTTON4,
+};
+
+

 %{
 #if !wxUSE_JOYSTICK && !defined(__WXMSW__)
 // A C++ stub class for wxJoystick for platforms that don't have it.
 %{
 #if !wxUSE_JOYSTICK && !defined(__WXMSW__)
 // A C++ stub class for wxJoystick for platforms that don't have it.


@@ -1359,49 +1466,48 @@ extern wxMimeTypesManager* wxTheMimeTypesManager;
 
 %}
 
 
 %}
 

-// Art clients
-#define wxART_TOOLBAR                  "toolbar_C"
-#define wxART_MENU                     "menu_C"
-#define wxART_FRAME_ICON               "frame_icon_C"
-
-#define wxART_CMN_DIALOG               "cmn_dialog_C"
-#define wxART_HELP_BROWSER             "help_browser_C"
-#define wxART_MESSAGE_BOX              "message_box_C"
-
-#define wxART_OTHER                    "other_C"
-
-// Art IDs
-#define wxART_ADD_BOOKMARK             "add_bookmark"
-#define wxART_DEL_BOOKMARK             "del_bookmark"
-#define wxART_HELP_SIDE_PANEL          "help_side_panel"
-#define wxART_HELP_SETTINGS            "help_settings"
-#define wxART_HELP_BOOK                "help_book"
-#define wxART_HELP_FOLDER              "help_folder"
-#define wxART_HELP_PAGE                "help_page"
-#define wxART_GO_BACK                  "go_back"
-#define wxART_GO_FORWARD               "go_forward"
-#define wxART_GO_UP                    "go_up"
-#define wxART_GO_DOWN                  "go_down"
-#define wxART_GO_TO_PARENT             "go_to_parent"
-#define wxART_GO_HOME                  "go_home"
-#define wxART_FILE_OPEN                "file_open"
-#define wxART_PRINT                    "print"
-#define wxART_HELP                     "help"
-#define wxART_TIP                      "tip"
-#define wxART_REPORT_VIEW              "report_view"
-#define wxART_LIST_VIEW                "list_view"
-#define wxART_NEW_DIR                  "new_dir"
-#define wxART_FOLDER                   "folder"
-#define wxART_GO_DIR_UP                "go_dir_up"
-#define wxART_EXECUTABLE_FILE          "executable_file"
-#define wxART_NORMAL_FILE              "normal_file"
-#define wxART_TICK_MARK                "tick"
-#define wxART_CROSS_MARK               "cross"
-#define wxART_ERROR                    "error"
-#define wxART_QUESTION                 "question"
-#define wxART_WARNING                  "warning"
-#define wxART_INFORMATION              "information"
-
+%pragma(python) code = "
+# Art clients
+wxART_TOOLBAR              = 'wxART_TOOLBAR_C'
+wxART_MENU                 = 'wxART_MENU_C'
+wxART_FRAME_ICON           = 'wxART_FRAME_ICON_C'
+wxART_CMN_DIALOG           = 'wxART_CMN_DIALOG_C'
+wxART_HELP_BROWSER         = 'wxART_HELP_BROWSER_C'
+wxART_MESSAGE_BOX          = 'wxART_MESSAGE_BOX_C'
+wxART_OTHER                = 'wxART_OTHER_C'
+
+# Art IDs
+wxART_ADD_BOOKMARK         = 'wxART_ADD_BOOKMARK'
+wxART_DEL_BOOKMARK         = 'wxART_DEL_BOOKMARK'
+wxART_HELP_SIDE_PANEL      = 'wxART_HELP_SIDE_PANEL'
+wxART_HELP_SETTINGS        = 'wxART_HELP_SETTINGS'
+wxART_HELP_BOOK            = 'wxART_HELP_BOOK'
+wxART_HELP_FOLDER          = 'wxART_HELP_FOLDER'
+wxART_HELP_PAGE            = 'wxART_HELP_PAGE'
+wxART_GO_BACK              = 'wxART_GO_BACK'
+wxART_GO_FORWARD           = 'wxART_GO_FORWARD'
+wxART_GO_UP                = 'wxART_GO_UP'
+wxART_GO_DOWN              = 'wxART_GO_DOWN'
+wxART_GO_TO_PARENT         = 'wxART_GO_TO_PARENT'
+wxART_GO_HOME              = 'wxART_GO_HOME'
+wxART_FILE_OPEN            = 'wxART_FILE_OPEN'
+wxART_PRINT                = 'wxART_PRINT'
+wxART_HELP                 = 'wxART_HELP'
+wxART_TIP                  = 'wxART_TIP'
+wxART_REPORT_VIEW          = 'wxART_REPORT_VIEW'
+wxART_LIST_VIEW            = 'wxART_LIST_VIEW'
+wxART_NEW_DIR              = 'wxART_NEW_DIR'
+wxART_FOLDER               = 'wxART_FOLDER'
+wxART_GO_DIR_UP            = 'wxART_GO_DIR_UP'
+wxART_EXECUTABLE_FILE      = 'wxART_EXECUTABLE_FILE'
+wxART_NORMAL_FILE          = 'wxART_NORMAL_FILE'
+wxART_TICK_MARK            = 'wxART_TICK_MARK'
+wxART_CROSS_MARK           = 'wxART_CROSS_MARK'
+wxART_ERROR                = 'wxART_ERROR'
+wxART_QUESTION             = 'wxART_QUESTION'
+wxART_WARNING              = 'wxART_WARNING'
+wxART_INFORMATION          = 'wxART_INFORMATION'
+"

 
 %{  // Python aware wxArtProvider
 class wxPyArtProvider : public wxArtProvider  {
 
 %{  // Python aware wxArtProvider
 class wxPyArtProvider : public wxArtProvider  {


@@ -1512,11 +1618,24 @@ public:
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

+// %{
+// #if wxUSE_UNICODE
+// #define ADD_STRING(dict, str) \
+//     wxString tmp##str(str); \
+//     PyDict_SetItemString(dict, #str, \
+//                          PyUnicode_FromUnicode(tmp##str.c_str(), tmp##str.Len()))
+// #else
+// #define ADD_STRING(dict, str) \
+//     PyDict_SetItemString(d, #str, PyString_FromString(str))
+// #endif
+// %}
+

 
 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
     wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
 
 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
     wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");

+

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------