Emptied patch.rsp

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 15385017102396c33dd8d9250de0531152f9595f..1e11812c298580603fe91b10743b87504a46782f 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -46,6 +46,7 @@
 %import gdi.i
 %import events.i
 %import streams.i
 %import gdi.i
 %import events.i
 %import streams.i

+%import utils.i

 
 %{
     static wxString wxPyEmptyStr("");
 
 %{
     static wxString wxPyEmptyStr("");


@@ -346,8 +347,8 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 public:
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();
 public:
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();

-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxFontEnumerator)"
+    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 EnumerateFacenames(
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all


@@ -359,12 +360,12 @@ public:
     %addmethods {
         PyObject* GetEncodings() {
             wxArrayString* arr = self->GetEncodings();
     %addmethods {
         PyObject* GetEncodings() {
             wxArrayString* arr = self->GetEncodings();

-            return wxArrayString2PyList_helper(arr);
+            return wxArrayString2PyList_helper(*arr);

         }
 
         PyObject* GetFacenames() {
             wxArrayString* arr = self->GetFacenames();
         }
 
         PyObject* GetFacenames() {
             wxArrayString* arr = self->GetFacenames();

-            return wxArrayString2PyList_helper(arr);
+            return wxArrayString2PyList_helper(*arr);

         }
     }
 };
         }
     }
 };


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

+#ifdef WXP_WITH_THREAD

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

+#else
+        return TRUE;
+#endif

     }
 %}
 
     }
 %}
 


@@ -1277,6 +1282,42 @@ 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(AddFilesToSingleMenu)void AddFilesToMenu(wxMenu* menu);
+
+    // Accessors
+    wxString GetHistoryFile(int i) const;
+
+    // A synonym for GetNoHistoryFiles
+    int GetCount() const;
+    int GetNoHistoryFiles() const;
+
+};
+

 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------