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 b55b4f6bed9835cd6fdb220d60674300bd59a3a0..eb1c5a8eb0283656f3af650ae950c02263a1bc4d 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -55,7 +55,7 @@
     // Put some wx default wxChar* values into wxStrings.
     DECLARE_DEF_STRING(FileSelectorPromptStr);
     DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
     // 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(""));
 %}
 
     static const wxString wxPyEmptyString(wxT(""));
 %}
 


@@ -83,6 +83,13 @@ wxString wxSaveFileSelector(const wxString& what,
                             const wxString& default_name = wxPyEmptyString,
                             wxWindow *parent = NULL);
 
                             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,
                            const wxString& caption = wxPyEmptyString,
                            const wxString& default_value = wxPyEmptyString,
 wxString wxGetTextFromUser(const wxString& message,
                            const wxString& caption = wxPyEmptyString,
                            const wxString& default_value = wxPyEmptyString,


@@ -572,7 +579,7 @@ public:
     static void SetTimestamp(const wxString& ts);
     static const wxString& GetTimestamp();
 
     static void SetTimestamp(const wxString& ts);
     static const wxString& GetTimestamp();
 

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

 
     static wxTraceMask GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);
 
     static wxTraceMask GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);


@@ -625,14 +632,6 @@ public:
 };
 
 
 };
 
 

-class wxLogNull
-{
-public:
-    wxLogNull();
-    ~wxLogNull();
-};
-
-

 class wxLogChain : public wxLog
 {
 public:
 class wxLogChain : public wxLog
 {
 public:


@@ -656,9 +655,19 @@ void wxLogStatus(const wxString& szFormat);
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
 void wxLogSysError(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() {}