Allow for Cmd-click on wxMac

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

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 4f35d16f6be617d410b621688d90e33753959561..d248f1a0fa470758cde82b47f52f22ad5c6d5aa7 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -90,7 +90,8 @@ public:
             else
                 return new wxImage;
         }   
             else
                 return new wxImage;
         }   

-           
+
+        MustHaveApp(wxImage(const wxBitmap &bitmap));

         %name(ImageFromBitmap) wxImage(const wxBitmap &bitmap) {
             return new wxImage(bitmap.ConvertToImage());
         }
         %name(ImageFromBitmap) wxImage(const wxBitmap &bitmap) {
             return new wxImage(bitmap.ConvertToImage());
         }


@@ -312,6 +313,9 @@ success flag and rgb values.", "");
     static wxString GetImageExtWildcard();
 
 
     static wxString GetImageExtWildcard();
 
 

+MustHaveApp(ConvertToBitmap);
+MustHaveApp(ConvertToMonoBitmap);
+    

     %extend {
         wxBitmap ConvertToBitmap() {
             wxBitmap bitmap(*self);
     %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
 
 
 // See also wxPy_ReinitStockObjects in helpers.cpp