use specific linker flags under Mac OS X when linking executables against the

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 3c5fe21590a4b1410a63cc63931adaf2cbc06e25..eb1c5a8eb0283656f3af650ae950c02263a1bc4d 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -16,10 +16,10 @@
 
 %{
 #include "helpers.h"
 
 %{
 #include "helpers.h"

+#include "pyistream.h"

 #include <wx/resource.h>
 #include <wx/tooltip.h>
 #include <wx/caret.h>
 #include <wx/resource.h>
 #include <wx/tooltip.h>
 #include <wx/caret.h>

-#include <wx/fontenum.h>

 #include <wx/tipdlg.h>
 #include <wx/process.h>
 
 #include <wx/tipdlg.h>
 #include <wx/process.h>
 


@@ -49,28 +49,57 @@
 %import utils.i
 
 
 %import utils.i
 
 

+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(FileSelectorPromptStr);
+    DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
+    DECLARE_DEF_STRING(DirSelectorPromptStr);
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+

 //---------------------------------------------------------------------------
 // Dialog Functions
 
 //---------------------------------------------------------------------------
 // Dialog Functions
 

-wxString wxFileSelector(char* message,
-                        char* default_path = NULL,
-                        char* default_filename = NULL,
-                        char* default_extension = NULL,
-                        char* wildcard = "*.*",
+wxString wxFileSelector(const wxString& message = wxPyFileSelectorPromptStr,
+                        const wxString& default_path = wxPyEmptyString,
+                        const wxString& default_filename = wxPyEmptyString,
+                        const wxString& default_extension = wxPyEmptyString,
+                        const wxString& wildcard = wxPyFileSelectorDefaultWildcardStr,

                         int flags = 0,
                         wxWindow *parent = NULL,
                         int x = -1, int y = -1);
 
                         int flags = 0,
                         wxWindow *parent = NULL,
                         int x = -1, int y = -1);
 

+// Ask for filename to load
+wxString wxLoadFileSelector(const wxString& what,
+                            const wxString& extension,
+                            const wxString& default_name = wxPyEmptyString,
+                            wxWindow *parent = NULL);
+
+// Ask for filename to save
+wxString wxSaveFileSelector(const wxString& what,
+                            const wxString& extension,
+                            const wxString& default_name = wxPyEmptyString,
+                            wxWindow *parent = NULL);
+
+
+wxString wxDirSelector(const wxString& message = wxPyDirSelectorPromptStr,
+                       const wxString& defaultPath = wxPyEmptyString,
+                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+                       const wxPoint& pos = wxDefaultPosition,
+                       wxWindow *parent = NULL);
+

 wxString wxGetTextFromUser(const wxString& message,
 wxString wxGetTextFromUser(const wxString& message,

-                           const wxString& caption = wxEmptyString,
-                           const wxString& default_value = wxEmptyString,
+                           const wxString& caption = wxPyEmptyString,
+                           const wxString& default_value = wxPyEmptyString,

                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            bool centre = TRUE);
 
 wxString wxGetPasswordFromUser(const wxString& message,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            bool centre = TRUE);
 
 wxString wxGetPasswordFromUser(const wxString& message,

-                               const wxString& caption = wxEmptyString,
-                               const wxString& default_value = wxEmptyString,
+                               const wxString& caption = wxPyEmptyString,
+                               const wxString& default_value = wxPyEmptyString,

                                wxWindow *parent = NULL);
 
 
                                wxWindow *parent = NULL);
 
 


@@ -98,7 +127,7 @@ int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
 
 
 int wxMessageBox(const wxString& message,
 
 
 int wxMessageBox(const wxString& message,

-                 const wxString& caption = wxEmptyString,
+                 const wxString& caption = wxPyEmptyString,

                  int style = wxOK | wxCENTRE,
                  wxWindow *parent = NULL,
                  int x = -1, int y = -1);
                  int style = wxOK | wxCENTRE,
                  wxWindow *parent = NULL,
                  int x = -1, int y = -1);


@@ -150,15 +179,15 @@ void wxFlushEvents();
 //---------------------------------------------------------------------------
 // Resource System
 
 //---------------------------------------------------------------------------
 // Resource System
 

-bool wxResourceAddIdentifier(char *name, int value);
+bool wxResourceAddIdentifier(char* name, int value);

 void wxResourceClear(void);
 void wxResourceClear(void);

-wxBitmap  wxResourceCreateBitmap(char *resource);
-wxIcon  wxResourceCreateIcon(char *resource);
-wxMenuBar * wxResourceCreateMenuBar(char *resource);
-int wxResourceGetIdentifier(char *name);
-bool wxResourceParseData(char *resource, wxResourceTable *table = NULL);
-bool wxResourceParseFile(char *filename, wxResourceTable *table = NULL);
-bool wxResourceParseString(char *resource, wxResourceTable *table = NULL);
+wxBitmap  wxResourceCreateBitmap(char* resource);
+wxIcon  wxResourceCreateIcon(char* resource);
+wxMenuBar * wxResourceCreateMenuBar(char* resource);
+int wxResourceGetIdentifier(char* name);
+bool wxResourceParseData(char* resource, wxResourceTable *table = NULL);
+bool wxResourceParseFile(char* filename, wxResourceTable *table = NULL);
+bool wxResourceParseString(char* resource, wxResourceTable *table = NULL);

 
 //---------------------------------------------------------------------------
 // System Settings
 
 //---------------------------------------------------------------------------
 // System Settings


@@ -342,52 +371,6 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-%{
-class wxPyFontEnumerator : public wxFontEnumerator {
-public:
-    wxPyFontEnumerator() {}
-    ~wxPyFontEnumerator() {}
-
-    DEC_PYCALLBACK_BOOL_STRING(OnFacename);
-    DEC_PYCALLBACK_BOOL_STRINGSTRING(OnFontEncoding);
-
-    PYPRIVATE;
-};
-
-IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
-IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
-
-%}
-
-%name(wxFontEnumerator) class wxPyFontEnumerator {
-public:
-    wxPyFontEnumerator();
-    ~wxPyFontEnumerator();
-    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator, 0)"
-
-    bool EnumerateFacenames(
-        wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
-        bool fixedWidthOnly = FALSE);
-    bool EnumerateEncodings(const char* facename = "");
-
-    //wxArrayString* GetEncodings();
-    //wxArrayString* GetFacenames();
-    %addmethods {
-        PyObject* GetEncodings() {
-            wxArrayString* arr = self->GetEncodings();
-            return wxArrayString2PyList_helper(*arr);
-        }
-
-        PyObject* GetFacenames() {
-            wxArrayString* arr = self->GetFacenames();
-            return wxArrayString2PyList_helper(*arr);
-        }
-    }
-};
-
-//----------------------------------------------------------------------
-

 class  wxBusyCursor {
 public:
     wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);
 class  wxBusyCursor {
 public:
     wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);


@@ -573,7 +556,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 char *szString, int t=0);
+    static void OnLog(wxLogLevel level, const wxString& szString, int t=0);

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


@@ -585,7 +568,7 @@ public:
     static void Suspend();
     static void Resume();
 
     static void Suspend();
     static void Resume();
 

-    void SetVerbose(bool bVerbose = TRUE);
+    static void SetVerbose(bool bVerbose = TRUE);

 
     static void DontCreateOnDemand();
     static void SetTraceMask(wxTraceMask ulMask);
 
     static void DontCreateOnDemand();
     static void SetTraceMask(wxTraceMask ulMask);


@@ -593,13 +576,13 @@ public:
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();
 
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();
 

-    static void SetTimestamp(const wxChar *ts);
-    static const wxChar *GetTimestamp();
+    static void SetTimestamp(const wxString& ts);
+    static const wxString& GetTimestamp();

 
 

-    bool GetVerbose() const { return m_bVerbose; }
+    bool GetVerbose() const;

 
     static wxTraceMask GetTraceMask();
 
     static wxTraceMask GetTraceMask();

-    static bool IsAllowedTraceMask(const char *mask);
+    static bool IsAllowedTraceMask(const wxString& mask);

 
     // static void TimeStamp(wxString *str);
     %addmethods {
 
     // static void TimeStamp(wxString *str);
     %addmethods {


@@ -609,6 +592,7 @@ public:
             return msg;
         }
     }
             return msg;
         }
     }

+

 };
 
 
 };
 
 


@@ -636,7 +620,7 @@ class wxLogWindow : public wxLog
 {
 public:
     wxLogWindow(wxFrame *pParent,         // the parent frame (can be NULL)
 {
 public:
     wxLogWindow(wxFrame *pParent,         // the parent frame (can be NULL)

-            const char *szTitle,          // the title of the frame
+            const wxString& szTitle,      // the title of the frame

             bool bShow = TRUE,            // show window immediately?
             bool bPassToOld = TRUE);      // pass log messages to the old target?
 
             bool bShow = TRUE,            // show window immediately?
             bool bPassToOld = TRUE);      // pass log messages to the old target?
 


@@ -644,15 +628,7 @@ public:
     wxFrame *GetFrame() const;
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;
     wxFrame *GetFrame() const;
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;

-    void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; }
-};
-
-
-class wxLogNull
-{
-public:
-    wxLogNull();
-    ~wxLogNull();
+    void PassMessages(bool bDoPass);

 };
 
 
 };
 
 


@@ -668,20 +644,30 @@ public:
 
 
 unsigned long wxSysErrorCode();
 
 
 unsigned long wxSysErrorCode();

-const char* wxSysErrorMsg(unsigned long nErrCode = 0);
-void wxLogFatalError(const char *szFormat);
-void wxLogError(const char *szFormat);
-void wxLogWarning(const char *szFormat);
-void wxLogMessage(const char *szFormat);
-void wxLogInfo(const char *szFormat);
-void wxLogVerbose(const char *szFormat);
-void wxLogStatus(const char *szFormat);
-%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const char *szFormat);
-void wxLogSysError(const char *szFormat);
+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);
+
+// Suspress logging while an instance of this class exists
+class wxLogNull
+{
+public:
+    wxLogNull();
+    ~wxLogNull();
+};
+
+

 
 
 %{
 
 
 %{

-// A Log class that can be derived from in wxPython
+// A wxLog class that can be derived from in wxPython

 class wxPyLog : public wxLog {
 public:
     wxPyLog() : wxLog() {}
 class wxPyLog : public wxLog {
 public:
     wxPyLog() : wxLog() {}


@@ -690,7 +676,8 @@ public:
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))

-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(isi)", level, szString, t));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level,
+                                                         wx2PyString(szString), t));

         wxPyEndBlockThreads();
         if (! found)
             wxLog::DoLog(level, szString, t);
         wxPyEndBlockThreads();
         if (! found)
             wxLog::DoLog(level, szString, t);


@@ -700,7 +687,8 @@ public:
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))

-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(si)", szString, t));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)",
+                                                         wx2PyString(szString), t));

         wxPyEndBlockThreads();
         if (! found)
             wxLog::DoLogString(szString, t);
         wxPyEndBlockThreads();
         if (! found)
             wxLog::DoLogString(szString, t);


@@ -781,9 +769,26 @@ public:
 };
 
 
 };
 
 

+enum
+{
+    // execute the process asynchronously
+    wxEXEC_ASYNC    = 0,
+
+    // execute it synchronously, i.e. wait until it finishes
+    wxEXEC_SYNC     = 1,
+
+    // under Windows, don't hide the child even if it's IO is redirected (this
+    // is done by default)
+    wxEXEC_NOHIDE   = 2,
+
+    // under Unix, if the process is the group leader then killing -pid kills
+    // all children as well as pid
+    wxEXEC_MAKE_GROUP_LEADER = 4
+};
+

 
 long wxExecute(const wxString& command,
 
 long wxExecute(const wxString& command,

-               int sync = FALSE,
+               int flags = wxEXEC_ASYNC,

                wxPyProcess *process = NULL);
 
 //----------------------------------------------------------------------
                wxPyProcess *process = NULL);
 
 //----------------------------------------------------------------------


@@ -965,10 +970,10 @@ class wxFileTypeInfo
 public:
     // ctors
         // a normal item
 public:
     // ctors
         // a normal item

-    wxFileTypeInfo(const char *mimeType,
-                   const char *openCmd,
-                   const char *printCmd,
-                   const char *desc);
+    wxFileTypeInfo(const char* mimeType,
+                   const char* openCmd,
+                   const char* printCmd,
+                   const char* desc);

 
 
         // the array elements correspond to the parameters of the ctor above in
 
 
         // the array elements correspond to the parameters of the ctor above in


@@ -1036,8 +1041,8 @@ public:
     {
     public:
         // ctors
     {
     public:
         // ctors

-        MessageParameters(const wxString& filename=wxEmptyString,
-                          const wxString& mimetype=wxEmptyString);
+        MessageParameters(const wxString& filename=wxPyEmptyString,
+                          const wxString& mimetype=wxPyEmptyString);

 
         // accessors (called by GetOpenCommand)
             // filename
 
         // accessors (called by GetOpenCommand)
             // filename


@@ -1060,8 +1065,13 @@ public:
     %addmethods {
         PyObject* GetMimeType() {
             wxString str;
     %addmethods {
         PyObject* GetMimeType() {
             wxString str;

-            if (self->GetMimeType(&str))
-                return PyString_FromString(str.c_str());
+            if (self->GetMimeType(&str)) {
+#if wxUSE_UNICODE
+             return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+             return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+           }

             else
                 RETURN_NONE();
         }
             else
                 RETURN_NONE();
         }


@@ -1108,7 +1118,11 @@ public:
                 PyObject* tuple = PyTuple_New(3);
                 PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon),
                                                               "wxIcon", TRUE));
                 PyObject* tuple = PyTuple_New(3);
                 PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon),
                                                               "wxIcon", TRUE));

-                PyTuple_SetItem(tuple, 1, PyString_FromString(iconFile.c_str()));
+#if wxUSE_UNICODE
+                PyTuple_SetItem(tuple, 1, PyUnicode_FromUnicode(iconFile.c_str(), iconFile.Len()));
+#else
+                PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize(iconFile.c_str(), iconFile.Len()));
+#endif

                 PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
                 wxPyEndBlockThreads();
                 return tuple;
                 PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
                 wxPyEndBlockThreads();
                 return tuple;


@@ -1122,9 +1136,13 @@ public:
         // get a brief file type description ("*.txt" => "text document")
         PyObject* GetDescription() {
             wxString str;
         // get a brief file type description ("*.txt" => "text document")
         PyObject* GetDescription() {
             wxString str;

-            if (self->GetDescription(&str))
-                return PyString_FromString(str.c_str());
-            else
+            if (self->GetDescription(&str)) {
+#if  wxUSE_UNICODE
+             return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+             return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+            } else

                 RETURN_NONE();
         }
     }
                 RETURN_NONE();
         }
     }


@@ -1133,11 +1151,15 @@ public:
     // get the command to open/execute the file of given type
     %addmethods {
         PyObject* GetOpenCommand(const wxString& filename,
     // get the command to open/execute the file of given type
     %addmethods {
         PyObject* GetOpenCommand(const wxString& filename,

-                                 const wxString& mimetype=wxEmptyString) {
+                                 const wxString& mimetype=wxPyEmptyString) {

             wxString str;
             wxString str;

-            if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
-                return PyString_FromString(str.c_str());
-            else
+            if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
+#if  wxUSE_UNICODE
+                return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+                return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+            } else

                 RETURN_NONE();
         }
     }
                 RETURN_NONE();
         }
     }


@@ -1146,11 +1168,15 @@ public:
     // get the command to print the file of given type
     %addmethods {
         PyObject* GetPrintCommand(const wxString& filename,
     // get the command to print the file of given type
     %addmethods {
         PyObject* GetPrintCommand(const wxString& filename,

-                                  const wxString& mimetype=wxEmptyString) {
+                                  const wxString& mimetype=wxPyEmptyString) {

             wxString str;
             wxString str;

-            if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype)))
-                return PyString_FromString(str.c_str());
-            else
+            if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
+#if wxUSE_UNICODE
+                return PyUnicode_FromUnicode(str.c_str(), str.Len());
+#else
+                return PyString_FromStringAndSize(str.c_str(), str.Len());
+#endif
+            } else

                 RETURN_NONE();
         }
     }
                 RETURN_NONE();
         }
     }


@@ -1159,7 +1185,7 @@ public:
     // Get all commands defined for this file type
     %addmethods {
         PyObject* GetAllCommands(const wxString& filename,
     // Get all commands defined for this file type
     %addmethods {
         PyObject* GetAllCommands(const wxString& filename,

-                                 const wxString& mimetype=wxEmptyString) {
+                                 const wxString& mimetype=wxPyEmptyString) {

             wxArrayString verbs;
             wxArrayString commands;
             if (self->GetAllCommands(&verbs, &commands,
             wxArrayString verbs;
             wxArrayString commands;
             if (self->GetAllCommands(&verbs, &commands,


@@ -1182,7 +1208,7 @@ public:
     bool SetCommand(const wxString& cmd, const wxString& verb,
                     bool overwriteprompt = TRUE);
 
     bool SetCommand(const wxString& cmd, const wxString& verb,
                     bool overwriteprompt = TRUE);
 

-    bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
+    bool SetDefaultIcon(const wxString& cmd = wxPyEmptyString, int index = 0);

 
 
     // remove the association for this filetype from the system MIME database:
 
 
     // remove the association for this filetype from the system MIME database:


@@ -1226,7 +1252,7 @@ public:
     // use the extraDir parameter if you want to look for files in another
     // directory
     void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
     // use the extraDir parameter if you want to look for files in another
     // directory
     void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,

-                    const wxString& extraDir = wxEmptyString);
+                    const wxString& extraDir = wxPyEmptyString);

 
     // and this function clears all the data from the manager
     void ClearData();
 
     // and this function clears all the data from the manager
     void ClearData();


@@ -1324,7 +1350,7 @@ public:
     void Save(wxConfigBase& config);
 
     void AddFilesToMenu();
     void Save(wxConfigBase& config);
 
     void AddFilesToMenu();

-    %name(AddFilesToSingleMenu)void AddFilesToMenu(wxMenu* menu);
+    %name(AddFilesToThisMenu)void AddFilesToMenu(wxMenu* menu);

 
     // Accessors
     wxString GetHistoryFile(int i) const;
 
     // Accessors
     wxString GetHistoryFile(int i) const;


@@ -1340,7 +1366,6 @@ public:
 
 
 %init %{
 
 
 %init %{

-    wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");

     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
 %}
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
 %}