trying to make GetData() return data format more clear

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

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 154f55d5e0f66515430ad784da3f83b7a9fb8033..7c3ea504671eebe2f56254d198c96cb861b0a8d2 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -84,7 +84,7 @@ public:
     %name(ImageFromStream) wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
     %name(ImageFromStreamMime) wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1 );
     %extend {
     %name(ImageFromStream) wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
     %name(ImageFromStreamMime) wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1 );
     %extend {

-        %name(EmptyImage) wxImage(int width=0, int height=0, bool clear = True) {
+        %name(EmptyImage) wxImage(int width=0, int height=0, bool clear = true) {

             if (width > 0 && height > 0)
                 return new wxImage(width, height, clear);
             else
             if (width > 0 && height > 0)
                 return new wxImage(width, height, clear);
             else


@@ -104,7 +104,7 @@ public:
                 return NULL;
             }
             memcpy(copy, data, width*height*3);
                 return NULL;
             }
             memcpy(copy, data, width*height*3);

-            return new wxImage(width, height, copy, False);
+            return new wxImage(width, height, copy, false);

         }
     }
 
         }
     }
 


@@ -200,7 +200,8 @@ nothing.", "");
             unsigned char* dataPtr;
 
             if (! PyString_Check(data)) {
             unsigned char* dataPtr;
 
             if (! PyString_Check(data)) {

-                PyErr_SetString(PyExc_TypeError, "Expected string object");
+                wxPyBLOCK_THREADS(PyErr_SetString(PyExc_TypeError,
+                                                  "Expected string object"));

                 return /* NULL */ ;
             }
 
                 return /* NULL */ ;
             }
 


@@ -296,13 +297,13 @@ nothing.", "");
     unsigned char GetMaskRed();
     unsigned char GetMaskGreen();
     unsigned char GetMaskBlue();
     unsigned char GetMaskRed();
     unsigned char GetMaskGreen();
     unsigned char GetMaskBlue();

-    void SetMask( bool mask = True );
+    void SetMask( bool mask = true );

     bool HasMask();
 
     wxImage Rotate(double angle, const wxPoint & centre_of_rotation,
     bool HasMask();
 
     wxImage Rotate(double angle, const wxPoint & centre_of_rotation,

-                   bool interpolating = True, wxPoint * offset_after_rotation = NULL) const ;
-    wxImage Rotate90( bool clockwise = True ) ;
-    wxImage Mirror( bool horizontally = True ) ;
+                   bool interpolating = true, wxPoint * offset_after_rotation = NULL) const ;
+    wxImage Rotate90( bool clockwise = true ) ;
+    wxImage Mirror( bool horizontally = true ) ;

 
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   unsigned char r2, unsigned char g2, unsigned char b2 );
 
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   unsigned char r2, unsigned char g2, unsigned char b2 );


@@ -329,8 +330,8 @@ MustHaveApp(ConvertToBitmap);
 MustHaveApp(ConvertToMonoBitmap);
 
     %extend {
 MustHaveApp(ConvertToMonoBitmap);
 
     %extend {

-        wxBitmap ConvertToBitmap() {
-            wxBitmap bitmap(*self);
+        wxBitmap ConvertToBitmap(int depth=-1) {
+            wxBitmap bitmap(*self, depth);

             return bitmap;
         }
 
             return bitmap;
         }