Add wx.menuBar.UpdateMenus

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

diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index 83fa392e7556f3a9207c5764d462dc37941e559c..93fa2a2b9320fe80e44cdccd0f6f4748cffb4371 100644 (file)
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -107,7 +107,7 @@ public:
         wxBitmap(int width, int height, 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
         wxBitmap(int width, int height, 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.", "",
+for monochrome and -1 for the current display depth.", "",

         EmptyBitmap);
 
     DocCtorStrName(
         EmptyBitmap);
 
     DocCtorStrName(


@@ -150,8 +150,8 @@ bit depths, the behaviour is platform dependent.", "");
         
         %RenameCtor(BitmapFromBits, wxBitmap(PyObject* bits, int width, int height, int depth=1 ))
         {
         
         %RenameCtor(BitmapFromBits, wxBitmap(PyObject* bits, int width, int height, int depth=1 ))
         {

-            char* buf;
-            int   length;
+            char*      buf;
+            Py_ssize_t length;

             PyString_AsStringAndSize(bits, &buf, &length);
             return new wxBitmap(buf, width, height, depth);
         }
             PyString_AsStringAndSize(bits, &buf, &length);
             return new wxBitmap(buf, width, height, depth);
         }


@@ -201,6 +201,7 @@ bitmap. This preserves mask information so that bitmaps and images can
 be converted back and forth without loss in that respect.", "");
     
 
 be converted back and forth without loss in that respect.", "");
     
 

+    

     DocDeclStr(
         virtual wxMask* , GetMask() const,
         "Gets the associated mask (if any) which may have been loaded from a
     DocDeclStr(
         virtual wxMask* , GetMask() const,
         "Gets the associated mask (if any) which may have been loaded from a


@@ -211,13 +212,14 @@ file or explpicitly set for the bitmap.
 
     // MSW only?    wxBitmap GetMaskBitmap() const;
 
 
     // MSW only?    wxBitmap GetMaskBitmap() const;
 

+    %disownarg(wxMask*);

     DocDeclStr(
         virtual void , SetMask(wxMask* mask),
         "Sets the mask for this bitmap.
 
 :see: `GetMask`, `wx.Mask`
 ", "");
     DocDeclStr(
         virtual void , SetMask(wxMask* mask),
         "Sets the mask for this bitmap.
 
 :see: `GetMask`, `wx.Mask`
 ", "");

-    
+    %cleardisown(wxMask*);

     
     %extend {
         DocStr(SetMaskColour,
     
     %extend {
         DocStr(SetMaskColour,


@@ -283,8 +285,14 @@ the ``type`` parameter.", "");
     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);
     
 #ifdef __WXMSW__
     bool CopyFromCursor(const wxCursor& cursor);

+
+// WXWIN_COMPATIBILITY_2_4
+  #if 0

     int GetQuality();
     void SetQuality(int q);
     int GetQuality();
     void SetQuality(int q);

+    %pythoncode { GetQuality = wx._deprecated(GetQuality) }
+    %pythoncode { SetQuality = wx._deprecated(SetQuality) }
+  #endif

 #endif
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 #endif
 
     %pythoncode { def __nonzero__(self): return self.Ok() }


@@ -332,7 +340,7 @@ passed then BLACK is used.
         }
     }
     
         }
     }
     

-    //~wxMask();
+    ~wxMask();

 };
 
 %pythoncode { MaskColour = wx._deprecated(Mask, "wx.MaskColour is deprecated, use `wx.Mask` instead.") }
 };
 
 %pythoncode { MaskColour = wx._deprecated(Mask, "wx.MaskColour is deprecated, use `wx.Mask` instead.") }