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

diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index 241c9ceada..83fa392e75 100644
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -65,6 +65,8 @@ converted to a wx.Bitmap, so any image file format supported by
 ");
 
 
+MustHaveApp(wxBitmap);
+
 class wxBitmap : public wxGDIObject
 {
 public:
@@ -126,7 +128,9 @@ that a colour reduction may have to take place.", "",
     %extend {
         DocStr(wxBitmap(PyObject* listOfStrings),
                "Construct a Bitmap from a list of strings formatted as XPM data.", "");
-        %name(BitmapFromXPMData) wxBitmap(PyObject* listOfStrings) {
+        
+        %RenameCtor(BitmapFromXPMData, wxBitmap(PyObject* listOfStrings))
+        {
             char**    cArray = NULL;
             wxBitmap* bmp;
 
@@ -143,7 +147,9 @@ that a colour reduction may have to take place.", "",
 function for monochrome bitmaps (depth 1) in portable programs: in
 this case the bits parameter should contain an XBM image.  For other
 bit depths, the behaviour is platform dependent.", "");
-        %name(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;
             PyString_AsStringAndSize(bits, &buf, &length);
@@ -152,10 +158,6 @@ bit depths, the behaviour is platform dependent.", "");
     }    
 
     
-#ifdef __WXMSW__
-    void SetPalette(wxPalette& palette);
-#endif
-
     // wxGDIImage methods
 #ifdef __WXMSW__
     long GetHandle();
@@ -206,7 +208,8 @@ file or explpicitly set for the bitmap.
 
 :see: `SetMask`, `wx.Mask`
 ", "");
-    
+
+    // MSW only?    wxBitmap GetMaskBitmap() const;
 
     DocDeclStr(
         virtual void , SetMask(wxMask* mask),
@@ -247,8 +250,8 @@ the ``type`` parameter.", "");
     
 
     
-#if wxUSE_PALETTE
     virtual wxPalette *GetPalette() const;
+#ifdef __WXMSW__
     virtual void SetPalette(const wxPalette& palette);
 #endif
     
@@ -287,8 +290,8 @@ the ``type`` parameter.", "");
     %pythoncode { def __nonzero__(self): return self.Ok() }
 
     %extend {
-        bool __eq__(const wxBitmap* other) { return other ? (*self == *other) : False; }
-        bool __ne__(const wxBitmap* other) { return other ? (*self != *other) : True;  }
+        bool __eq__(const wxBitmap* other) { return other ? (*self == *other) : false; }
+        bool __ne__(const wxBitmap* other) { return other ? (*self != *other) : true;  }
     }
 };
 
@@ -306,6 +309,8 @@ A mask may be associated with a `wx.Bitmap`. It is used in
 `wx.MemoryDC` with a `wx.Bitmap` selected into it that contains a
 mask.", "");
 
+MustHaveApp(wxMask);
+
 class wxMask : public wxObject {
 public: