Changed how the stock objects (wx.RED, wx.RED_PEN, wx.RED_BRUSH, etc.)

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

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index b54b16dc4113ad99f4655768d68aabf3a3409292..0e3fc5ba79da4402fb75a93c293a0d26f3a546d0 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -345,7 +345,7 @@ public:
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();

-    // set the sigleton to 'mapper' instance and return previous one
+    // set the singleton to 'mapper' instance and return previous one

     static wxFontMapper *Set(wxFontMapper *mapper);
 
 
     static wxFontMapper *Set(wxFontMapper *mapper);
 
 


@@ -364,10 +364,13 @@ public:
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 

-    // return internal string identifier for the encoding (see also
-    // GetEncodingDescription())
+    // return canonical name of this encoding (this is a short string,
+    // GetEncodingDescription() returns a longer one)

     static wxString GetEncodingName(wxFontEncoding encoding);
 
     static wxString GetEncodingName(wxFontEncoding encoding);
 

+//     // return a list of all names of this encoding (see GetEncodingName)
+//     static const wxChar** GetAllEncodingNames(wxFontEncoding encoding);
+    

     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)


@@ -380,9 +383,6 @@ public:
     static wxFontEncoding GetEncodingFromName(const wxString& name);
 
 
     static wxFontEncoding GetEncodingFromName(const wxString& name);
 
 

-    // set the config object to use (may be NULL to use default)
-    void SetConfig(wxConfigBase *config);
-

     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 
     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 


@@ -842,19 +842,27 @@ public:
     //wxArrayString* GetFacenames();
     %extend {
         PyObject* GetEncodings() {
     //wxArrayString* GetFacenames();
     %extend {
         PyObject* GetEncodings() {

+            PyObject* ret;

             wxArrayString* arr = self->GetEncodings();
             wxArrayString* arr = self->GetEncodings();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

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

             else
             else

-                return PyList_New(0);
+                ret = PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
         PyObject* GetFacenames() {
         }
 
         PyObject* GetFacenames() {

+            PyObject* ret;

             wxArrayString* arr = self->GetFacenames();
             wxArrayString* arr = self->GetFacenames();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

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

             else
             else

-                return PyList_New(0);
+                ret =  PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
     }
 };
         }
     }
 };