implement wxColourDialog::Move() (patch 548048)

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 15385017102396c33dd8d9250de0531152f9595f..c8049586dda196d189599771c51767f3517af213 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>
 


@@ -46,33 +46,60 @@
 %import gdi.i
 %import events.i
 %import streams.i
 %import gdi.i
 %import events.i
 %import streams.i

+%import utils.i
+
+
+//----------------------------------------------------------------------

 
 %{
 
 %{

-    static wxString wxPyEmptyStr("");
+    // 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 = wxPyEmptyStr,
-                           const wxString& default_value = wxPyEmptyStr,
+                           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 = wxPyEmptyStr,
-                               const wxString& default_value = wxPyEmptyStr,
+                               const wxString& caption = wxPyEmptyString,
+                               const wxString& default_value = wxPyEmptyString,

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


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

-                 const wxString& caption = wxPyEmptyStr,
+                 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);


@@ -149,44 +176,45 @@ bool wxCheckForInterrupt(wxWindow *wnd);
 void wxFlushEvents();
 #endif
 
 void wxFlushEvents();
 #endif
 

+wxWindow* wxGetTopLevelParent(wxWindow *win);
+

 //---------------------------------------------------------------------------
 // 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
 

-enum {
-    wxSYS_WHITE_BRUSH,
-    wxSYS_LTGRAY_BRUSH,
-    wxSYS_GRAY_BRUSH,
-    wxSYS_DKGRAY_BRUSH,
-    wxSYS_BLACK_BRUSH,
-    wxSYS_NULL_BRUSH,
-    wxSYS_HOLLOW_BRUSH,
-    wxSYS_WHITE_PEN,
-    wxSYS_BLACK_PEN,
-    wxSYS_NULL_PEN,
-    wxSYS_OEM_FIXED_FONT,
+// possible values for wxSystemSettings::GetFont() parameter
+//
+enum wxSystemFont
+{
+    wxSYS_OEM_FIXED_FONT = 10,

     wxSYS_ANSI_FIXED_FONT,
     wxSYS_ANSI_VAR_FONT,
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
     wxSYS_DEFAULT_PALETTE,
     wxSYS_SYSTEM_FIXED_FONT,
     wxSYS_ANSI_FIXED_FONT,
     wxSYS_ANSI_VAR_FONT,
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
     wxSYS_DEFAULT_PALETTE,
     wxSYS_SYSTEM_FIXED_FONT,

-    wxSYS_DEFAULT_GUI_FONT,
+    wxSYS_DEFAULT_GUI_FONT
+};

 
 

+// possible values for wxSystemSettings::GetColour() parameter
+//
+enum wxSystemColour
+{

     wxSYS_COLOUR_SCROLLBAR,
     wxSYS_COLOUR_BACKGROUND,
     wxSYS_COLOUR_SCROLLBAR,
     wxSYS_COLOUR_BACKGROUND,

+    wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,

     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_INACTIVECAPTION,
     wxSYS_COLOUR_MENU,
     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_INACTIVECAPTION,
     wxSYS_COLOUR_MENU,


@@ -201,25 +229,35 @@ enum {
     wxSYS_COLOUR_HIGHLIGHT,
     wxSYS_COLOUR_HIGHLIGHTTEXT,
     wxSYS_COLOUR_BTNFACE,
     wxSYS_COLOUR_HIGHLIGHT,
     wxSYS_COLOUR_HIGHLIGHTTEXT,
     wxSYS_COLOUR_BTNFACE,

+    wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,

     wxSYS_COLOUR_BTNSHADOW,
     wxSYS_COLOUR_BTNSHADOW,

+    wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,

     wxSYS_COLOUR_GRAYTEXT,
     wxSYS_COLOUR_BTNTEXT,
     wxSYS_COLOUR_INACTIVECAPTIONTEXT,
     wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_GRAYTEXT,
     wxSYS_COLOUR_BTNTEXT,
     wxSYS_COLOUR_INACTIVECAPTIONTEXT,
     wxSYS_COLOUR_BTNHIGHLIGHT,

-
+    wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,

     wxSYS_COLOUR_3DDKSHADOW,
     wxSYS_COLOUR_3DLIGHT,
     wxSYS_COLOUR_INFOTEXT,
     wxSYS_COLOUR_INFOBK,
     wxSYS_COLOUR_3DDKSHADOW,
     wxSYS_COLOUR_3DLIGHT,
     wxSYS_COLOUR_INFOTEXT,
     wxSYS_COLOUR_INFOBK,

+    wxSYS_COLOUR_LISTBOX,
+    wxSYS_COLOUR_HOTLIGHT,
+    wxSYS_COLOUR_GRADIENTACTIVECAPTION,
+    wxSYS_COLOUR_GRADIENTINACTIVECAPTION,
+    wxSYS_COLOUR_MENUHILIGHT,
+    wxSYS_COLOUR_MENUBAR,
+
+    wxSYS_COLOUR_MAX
+};

 
 

-    wxSYS_COLOUR_DESKTOP,
-    wxSYS_COLOUR_3DFACE,
-    wxSYS_COLOUR_3DSHADOW,
-    wxSYS_COLOUR_3DHIGHLIGHT,
-    wxSYS_COLOUR_3DHILIGHT,
-    wxSYS_COLOUR_BTNHILIGHT,
-
-    wxSYS_MOUSE_BUTTONS,
+// possible values for wxSystemSettings::GetMetric() parameter
+//
+enum wxSystemMetric
+{
+    wxSYS_MOUSE_BUTTONS = 1,

     wxSYS_BORDER_X,
     wxSYS_BORDER_Y,
     wxSYS_CURSOR_X,
     wxSYS_BORDER_X,
     wxSYS_BORDER_Y,
     wxSYS_CURSOR_X,


@@ -255,25 +293,35 @@ enum {
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,

-    wxSYS_SWAP_BUTTONS,
+    wxSYS_SWAP_BUTTONS

 };
 
 };
 

+// possible values for wxSystemSettings::HasFeature() parameter
+enum wxSystemFeature
+{
+    wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
+    wxSYS_CAN_ICONIZE_FRAME
+};

 
 
 
 

-%inline %{

 
 

-    wxColour wxSystemSettings_GetSystemColour(int index) {
-        return wxSystemSettings::GetSystemColour(index);
-    }
+class wxSystemSettings {
+public:
+    // get a standard system colour
+    static wxColour GetColour(wxSystemColour index);
+
+    // get a standard system font
+    static wxFont GetFont(wxSystemFont index);
+
+    // get a system-dependent metric
+    static int GetMetric(wxSystemMetric index);
+
+    // return true if the port has certain feature
+    static bool HasFeature(wxSystemFeature index);
+
+};

 
 

-    wxFont wxSystemSettings_GetSystemFont(int index) {
-        return wxSystemSettings::GetSystemFont(index);
-    }

 
 

-    int wxSystemSettings_GetSystemMetric(int index) {
-        return wxSystemSettings::GetSystemMetric(index);
-    }
-%}

 
 //---------------------------------------------------------------------------
 // wxToolTip
 
 //---------------------------------------------------------------------------
 // wxToolTip


@@ -325,52 +373,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);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator)"
-
-    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);


@@ -409,7 +411,11 @@ public:
 
 %inline %{
     bool wxThread_IsMain() {
 
 %inline %{
     bool wxThread_IsMain() {

+#ifdef WXP_WITH_THREAD

         return wxThread::IsMain();
         return wxThread::IsMain();

+#else
+        return TRUE;
+#endif

     }
 %}
 
     }
 %}
 


@@ -516,6 +522,7 @@ class wxStopWatch
 public:
     // ctor starts the stop watch
     wxStopWatch();
 public:
     // ctor starts the stop watch
     wxStopWatch();

+    ~wxStopWatch();

     void Start(long t = 0);
     void Pause();
     void Resume();
     void Start(long t = 0);
     void Pause();
     void Resume();


@@ -551,7 +558,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;


@@ -563,7 +570,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);


@@ -571,13 +578,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 {


@@ -587,6 +594,7 @@ public:
             return msg;
         }
     }
             return msg;
         }
     }

+

 };
 
 
 };
 
 


@@ -614,7 +622,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?
 


@@ -622,15 +630,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);

 };
 
 
 };
 
 


@@ -646,40 +646,52 @@ 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() {}
 
     virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
         bool found;
 class wxPyLog : public wxLog {
 public:
     wxPyLog() : wxLog() {}
 
     virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
         bool found;

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLog")))

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

         if (! found)
             wxLog::DoLog(level, szString, t);
     }
 
     virtual void DoLogString(const wxChar *szString, time_t t) {
         bool found;
         if (! found)
             wxLog::DoLog(level, szString, t);
     }
 
     virtual void DoLogString(const wxChar *szString, time_t t) {
         bool found;

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString")))

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

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


@@ -759,9 +771,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);
 
 //----------------------------------------------------------------------


@@ -772,9 +801,9 @@ long wxExecute(const wxString& command,
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError, "wxJoystick is not available on this platform.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

     }
     wxPoint GetPosition() { return wxPoint(-1,-1); }
     int GetZPosition() { return -1; }
     }
     wxPoint GetPosition() { return wxPoint(-1,-1); }
     int GetZPosition() { return -1; }


@@ -887,14 +916,14 @@ class wxWave : public wxObject
 {
 public:
     wxWave(const wxString& fileName, bool isResource = FALSE) {
 {
 public:
     wxWave(const wxString& fileName, bool isResource = FALSE) {

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

     }
     wxWave(int size, const wxByte* data) {
     }
     wxWave(int size, const wxByte* data) {

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

     }
 
     ~wxWave() {}
     }
 
     ~wxWave() {}


@@ -943,10 +972,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


@@ -1014,8 +1043,8 @@ public:
     {
     public:
         // ctors
     {
     public:
         // ctors

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

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


@@ -1038,8 +1067,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();
         }


@@ -1082,13 +1116,17 @@ public:
             wxString iconFile;
             int iconIndex;
             if (self->GetIcon(&icon, &iconFile, &iconIndex)) {
             wxString iconFile;
             int iconIndex;
             if (self->GetIcon(&icon, &iconFile, &iconIndex)) {

-                wxPyTState* state = wxPyBeginBlockThreads();
+                wxPyBeginBlockThreads();

                 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));
                 PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));

-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();

                 return tuple;
             }
             else
                 return tuple;
             }
             else


@@ -1100,9 +1138,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();
         }
     }


@@ -1111,11 +1153,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=wxPyEmptyStr) {
+                                 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();
         }
     }


@@ -1124,11 +1170,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=wxPyEmptyStr) {
+                                  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();
         }
     }


@@ -1137,16 +1187,16 @@ 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=wxPyEmptyStr) {
+                                 const wxString& mimetype=wxPyEmptyString) {

             wxArrayString verbs;
             wxArrayString commands;
             if (self->GetAllCommands(&verbs, &commands,
                                      wxFileType::MessageParameters(filename, mimetype))) {
             wxArrayString verbs;
             wxArrayString commands;
             if (self->GetAllCommands(&verbs, &commands,
                                      wxFileType::MessageParameters(filename, mimetype))) {

-                wxPyTState* state = wxPyBeginBlockThreads();
+                wxPyBeginBlockThreads();

                 PyObject* tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
                 PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));
                 PyObject* tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
                 PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));

-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();

                 return tuple;
             }
             else
                 return tuple;
             }
             else


@@ -1160,7 +1210,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:


@@ -1204,7 +1254,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();


@@ -1277,12 +1327,47 @@ extern wxMimeTypesManager* wxTheMimeTypesManager;
 %}
 %readwrite
 
 %}
 %readwrite
 

+//----------------------------------------------------------------------
+
+%{
+#include <wx/docview.h>
+%}
+
+class wxFileHistory : public wxObject
+{
+public:
+    wxFileHistory(int maxFiles = 9);
+    ~wxFileHistory();
+
+    // Operations
+    void AddFileToHistory(const wxString& file);
+    void RemoveFileFromHistory(int i);
+    int GetMaxFiles() const;
+    void UseMenu(wxMenu *menu);
+
+    // Remove menu from the list (MDI child may be closing)
+    void RemoveMenu(wxMenu *menu);
+
+    void Load(wxConfigBase& config);
+    void Save(wxConfigBase& config);
+
+    void AddFilesToMenu();
+    %name(AddFilesToThisMenu)void AddFilesToMenu(wxMenu* menu);
+
+    // Accessors
+    wxString GetHistoryFile(int i) const;
+
+    // A synonym for GetNoHistoryFiles
+    int GetCount() const;
+    int GetNoHistoryFiles() const;
+
+};
+

 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 
 %init %{
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 
 %init %{

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

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