Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/wxPython/src/_config.i b/wxPython/src/_config.i
index 4ee0060a0f60af788f600583b714a52b4aa4f8f2..fd02d27e5121dbf9291865968cc8a957295de614 100644 (file)
--- a/wxPython/src/_config.i
+++ b/wxPython/src/_config.i
@@ -24,12 +24,14 @@
 
 %{
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
 
 %{
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {

+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }

+        wxPyEndBlockThreads(blocked);

         return ret;
     }
 %}
         return ret;
     }
 %}


@@ -85,12 +87,12 @@ public:
     };
 
 
     };
 
 

-    %apply SWIGTYPE *DISOWN { wxConfigBase *config };
+    %disownarg( wxConfigBase *config );

     DocDeclStr(
         static wxConfigBase *, Set(wxConfigBase *config),
         "Sets the global config object (the one returned by Get) and returns a
 reference to the previous global config object.", "");
     DocDeclStr(
         static wxConfigBase *, Set(wxConfigBase *config),
         "Sets the global config object (the one returned by Get) and returns a
 reference to the previous global config object.", "");

-    %clear wxConfigBase *config;
+    %cleardisown( wxConfigBase *config );

 
     DocDeclStr(
         static wxConfigBase *, Get(bool createOnDemand = true),
 
     DocDeclStr(
         static wxConfigBase *, Get(bool createOnDemand = true),


@@ -369,6 +371,17 @@ time)", "");
         long , GetStyle() const,
         "", "");
     
         long , GetStyle() const,
         "", "");
     

+    %property(AppName, GetAppName, SetAppName, doc="See `GetAppName` and `SetAppName`");
+    %property(EntryType, GetEntryType, doc="See `GetEntryType`");
+    %property(FirstEntry, GetFirstEntry, doc="See `GetFirstEntry`");
+    %property(FirstGroup, GetFirstGroup, doc="See `GetFirstGroup`");
+    %property(NextEntry, GetNextEntry, doc="See `GetNextEntry`");
+    %property(NextGroup, GetNextGroup, doc="See `GetNextGroup`");
+    %property(NumberOfEntries, GetNumberOfEntries, doc="See `GetNumberOfEntries`");
+    %property(NumberOfGroups, GetNumberOfGroups, doc="See `GetNumberOfGroups`");
+    %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+    %property(VendorName, GetVendorName, SetVendorName, doc="See `GetVendorName` and `SetVendorName`");

 };
 
 
 };
 
 


@@ -406,8 +419,11 @@ public:
                      const wxString& globalFilename = wxPyEmptyString,
                      long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE),
         "", "");
                      const wxString& globalFilename = wxPyEmptyString,
                      long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE),
         "", "");

-    

     ~wxFileConfig();
     ~wxFileConfig();

+    
+    static wxString GetGlobalFileName(const wxString& szFile);
+    static wxString GetLocalFileName(const wxString& szFile, int style = 0);
+    

 };
 
 
 };