Added some convenience methods to wx.Bitmap: SetSize, GetSize, and

wx.EmptyBitmap can be called with a wx.Size (or a 2-element sequence)
object too.  Similar changes were done for wx.Image as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index d13758551e5f9c848c611bf9b1cbcc5991e0237c..af1127d3e86a68efd46e2df9f91f59e27cc1a190 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -13,6 +13,12 @@ size is smaller than the item's GetBestSize.  When a window is added
 to a sizer it's initial size, if any, is set as the window's minimal
 size using SetSizeHints if there isn't already a minimal size.
 
 to a sizer it's initial size, if any, is set as the window's minimal
 size using SetSizeHints if there isn't already a minimal size.
 

+Added some convenience methods to wx.Bitmap: SetSize, GetSize, and
+wx.EmptyBitmap can be called with a wx.Size (or a 2-element sequence)
+object too.  Similar changes were done for wx.Image as well.
+
+
+

 
 2.5.1.5
 -------
 
 2.5.1.5
 -------

diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index 8f9213ea362d19a581a298c0b253bd9e335bc4e9..44f39290e6aa9a9f457d6b9be5269f58b6f12d9e 100644 (file)
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -53,12 +53,12 @@ public:
         
     ~wxBitmap();
 
         
     ~wxBitmap();
 

-    DocCtorStrName(
-        wxBitmap(int width, int height, int depth=-1),
-        "Creates a new bitmap of the given size.  A depth of -1 indicates the depth of\n"
-        "the current screen or visual. Some platforms only support 1 for monochrome and\n"
-        "-1 for the current colour setting.",
-        EmptyBitmap);
+//     DocCtorStrName(
+//         wxBitmap(int width, int height, int depth=-1),
+//         "Creates a new bitmap of the given size.  A depth of -1 indicates the depth of\n"
+//         "the current screen or visual. Some platforms only support 1 for monochrome and\n"
+//         "-1 for the current colour setting.",
+//         EmptyBitmap);

 
     DocCtorStrName(
         wxBitmap(const wxIcon& icon),
 
     DocCtorStrName(
         wxBitmap(const wxIcon& icon),


@@ -100,6 +100,21 @@ public:
             PyString_AsStringAndSize(bits, &buf, &length);
             return new wxBitmap(buf, width, height, depth);
         }
             PyString_AsStringAndSize(bits, &buf, &length);
             return new wxBitmap(buf, width, height, depth);
         }

+
+
+        DocStr(wxBitmap(const wxSize& size, int depth=-1), 
+               "Creates a new bitmap of the given size.  A depth of -1 indicates
+the depth of the current screen or visual. Some platforms only
+support 1 for monochrome and -1 for the current colour setting.");
+
+        %nokwargs wxBitmap(int width, int height, int depth=-1);
+        %nokwargs wxBitmap(const wxSize& size, int depth=-1);
+        %name(EmptyBitmap)wxBitmap(int width, int height, int depth=-1) {
+            return new wxBitmap(width, height, depth);
+        }
+        %name(EmptyBitmap)wxBitmap(const wxSize& size, int depth=-1) {
+            return new wxBitmap(size.x, size.y, depth);
+        }

     }    
 
     
     }    
 
     


@@ -128,6 +143,16 @@ public:
            "monochrome bitmap.");
     int GetDepth();
 
            "monochrome bitmap.");
     int GetDepth();
 

+
+    %extend {
+        DocStr(GetSize, "Get the size of the bitmap.");
+        wxSize GetSize() {
+            wxSize size(self->GetWidth(), self->GetHeight());
+            return size;
+        }
+    }
+
+    

     DocStr(ConvertToImage,
            "Creates a platform-independent image from a platform-dependent bitmap. This\n"
            "preserves mask information so that bitmaps and images can be converted back\n"
     DocStr(ConvertToImage,
            "Creates a platform-independent image from a platform-dependent bitmap. This\n"
            "preserves mask information so that bitmaps and images can be converted back\n"


@@ -182,6 +207,13 @@ public:
     DocStr(SetDepth, "Set the depth property (does not affect the bitmap data).")
     virtual void SetDepth(int depth);
 
     DocStr(SetDepth, "Set the depth property (does not affect the bitmap data).")
     virtual void SetDepth(int depth);
 

+    %extend {
+        DocStr(SetSize, "Set the bitmap size");
+        void SetSize(const wxSize& size) {
+            self->SetWidth(size.x);
+            self->SetHeight(size.y);
+        }
+    }

     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);
     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 1655963fc48b909095f1a2907a028fc729d74bf7..f5d4b36bd3f6069505eae1cee85f2b587bc75933 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -83,14 +83,24 @@ public:
     %name(ImageFromMime) wxImage(const wxString& name, const wxString& mimetype, int index = -1);
     %name(ImageFromStream) wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
     %name(ImageFromStreamMime) wxImage(wxInputStream& stream, const wxString& mimetype, int index = -1 );
     %name(ImageFromMime) wxImage(const wxString& name, const wxString& mimetype, int index = -1);
     %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 {
     %extend {

+
+        %nokwargs wxImage(int width=0, int height=0, bool clear = True);
+        %nokwargs wxImage(const wxSize& size, 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
                 return new wxImage;
         }   
         %name(EmptyImage) wxImage(int width=0, int height=0, bool clear = True) {
             if (width > 0 && height > 0)
                 return new wxImage(width, height, clear);
             else
                 return new wxImage;
         }   

-           
+        %name(EmptyImage) wxImage(const wxSize& size, bool clear = True) {
+            return new wxImage(size.x, size.y, clear);
+        }   
+
+        

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


@@ -161,6 +171,13 @@ public:
     int GetWidth();
     int GetHeight();
 
     int GetWidth();
     int GetHeight();
 

+    %extend {
+        wxSize GetSize() {
+            wxSize size(self->GetWidth(), self->GetHeight());
+            return size;
+        }
+    }
+

     wxImage GetSubImage(const wxRect& rect);
     wxImage Copy();
     void Paste( const wxImage &image, int x, int y );
     wxImage GetSubImage(const wxRect& rect);
     wxImage Copy();
     void Paste( const wxImage &image, int x, int y );