X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d07d2bc9d05408c58b76c53a0a291915b88e5064..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_image.i?ds=sidebyside

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 4f35d16f6b..d248f1a0fa 100644
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -90,7 +90,8 @@ public:
             else
                 return new wxImage;
         }   
-           
+
+        MustHaveApp(wxImage(const wxBitmap &bitmap));
         %name(ImageFromBitmap) wxImage(const wxBitmap &bitmap) {
             return new wxImage(bitmap.ConvertToImage());
         }
@@ -312,6 +313,9 @@ success flag and rgb values.", "");
     static wxString GetImageExtWildcard();
 
 
+MustHaveApp(ConvertToBitmap);
+MustHaveApp(ConvertToMonoBitmap);
+    
     %extend {
         wxBitmap ConvertToBitmap() {
             wxBitmap bitmap(*self);
@@ -332,7 +336,17 @@ success flag and rgb values.", "");
 
 
 
-void wxInitAllImageHandlers();
+///void wxInitAllImageHandlers();
+
+%pythoncode {
+    def InitAllImageHandlers():
+        """
+        The former functionality of InitAllImageHanders is now done internal to
+        the _core_ extension module and so this function has become a simple NOP.
+        """
+        pass
+}
+
 
 
 // See also wxPy_ReinitStockObjects in helpers.cpp