support Show() in wxFlexGridSizer (patch 737850)

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 15edd72de20b8feeca9a2d2775af99e5e192ef23..c719f1e09d2c157a98649ef2a107a269c3545db6 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -607,8 +607,6 @@ public:
     static void OnLog(unsigned long level, const wxString& szString, int t=0);
 
     virtual void Flush();
     static void OnLog(unsigned long level, const wxString& szString, int t=0);
 
     virtual void Flush();

-    bool HasPendingMessages() const;
-

     static void FlushActive();
     static wxLog *GetActiveTarget();
     static wxLog *SetActiveTarget(wxLog *pLogger);
     static void FlushActive();
     static wxLog *GetActiveTarget();
     static wxLog *SetActiveTarget(wxLog *pLogger);


@@ -1398,7 +1396,7 @@ public:
     //
     // use the extraDir parameter if you want to look for files in another
     // directory
     //
     // use the extraDir parameter if you want to look for files in another
     // directory

-    void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyle = wxMAILCAP_ALL,

                     const wxString& extraDir = wxPyEmptyString);
 
     // and this function clears all the data from the manager
                     const wxString& extraDir = wxPyEmptyString);
 
     // and this function clears all the data from the manager


@@ -1522,6 +1520,7 @@ wxART_ERROR                = 'wxART_ERROR'
 wxART_QUESTION             = 'wxART_QUESTION'
 wxART_WARNING              = 'wxART_WARNING'
 wxART_INFORMATION          = 'wxART_INFORMATION'
 wxART_QUESTION             = 'wxART_QUESTION'
 wxART_WARNING              = 'wxART_WARNING'
 wxART_INFORMATION          = 'wxART_INFORMATION'

+wxART_MISSING_IMAGE        = 'wxART_MISSING_IMAGE'

 "
 
 %{  // Python aware wxArtProvider
 "
 
 %{  // Python aware wxArtProvider


@@ -1693,19 +1692,6 @@ public:
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
 

-// %{
-// #if wxUSE_UNICODE
-// #define ADD_STRING(dict, str) \
-//     wxString tmp##str(str); \
-//     PyDict_SetItemString(dict, #str, \
-//                          PyUnicode_FromWideChar(tmp##str.c_str(), tmp##str.Len()))
-// #else
-// #define ADD_STRING(dict, str) \
-//     PyDict_SetItemString(d, #str, PyString_FromString(str))
-// #endif
-// %}
-
-

 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");