bitwise vs. logical operator

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

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 04650a8d31c2b73b4d1a2d80b2bf2f16f80f1a78..6b315bc824b97d15b8f1d24a5d09f40df220273d 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -232,6 +232,7 @@ public:
 };
 
 
 };
 
 

+

 class wxImage : public wxObject {
 public:
     %typemap(out) wxImage*;    // turn off this typemap
 class wxImage : public wxObject {
 public:
     %typemap(out) wxImage*;    // turn off this typemap


@@ -1046,8 +1047,8 @@ range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees", "");
     %property(MaskBlue, GetMaskBlue, doc="See `GetMaskBlue`");
     %property(MaskGreen, GetMaskGreen, doc="See `GetMaskGreen`");
     %property(MaskRed, GetMaskRed, doc="See `GetMaskRed`");
     %property(MaskBlue, GetMaskBlue, doc="See `GetMaskBlue`");
     %property(MaskGreen, GetMaskGreen, doc="See `GetMaskGreen`");
     %property(MaskRed, GetMaskRed, doc="See `GetMaskRed`");

-    %property(Size, GetSize, doc="See `GetSize`");

     %property(Width, GetWidth, doc="See `GetWidth`");
     %property(Width, GetWidth, doc="See `GetWidth`");

+    

 };
 
 
 };
 
 


@@ -1262,7 +1263,12 @@ public:
 };
 
 
 };
 
 

-#if wxUSE_IFF
+
+#if 0
+%{
+#include <wx/imagiff.h>
+%}
+

 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {
 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {


@@ -1271,6 +1277,19 @@ public:
 };
 #endif
 
 };
 #endif
 

+
+%{
+#include <wx/imagtga.h>
+%}
+
+DocStr(wxTGAHandler,
+"A `wx.ImageHandler` for TGA image files.", "");
+class wxTGAHandler : public wxImageHandler {
+public:
+    wxTGAHandler();
+};
+
+

 //---------------------------------------------------------------------------
 
 %{
 //---------------------------------------------------------------------------
 
 %{