X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe38c93368f632c8b62b98112a41a1de71f73e..f62262aacfac8b03ad7b8aca946c4fd5717b6c2e:/wxPython/src/_gdicmn.i?ds=sidebyside

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index d57c92d225..ac15dc4d98 100644
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -42,6 +42,7 @@ enum wxBitmapType
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ANI,
     wxBITMAP_TYPE_IFF,
+    wxBITMAP_TYPE_TGA,
     wxBITMAP_TYPE_MACCURSOR,
 
 //    wxBITMAP_TYPE_BMP_RESOURCE,
@@ -571,7 +572,7 @@ public:
 
 
     DocDeclStr(
-        wxRect&, Inflate(wxCoord dx, wxCoord dy),
+        wxRect, Inflate(wxCoord dx, wxCoord dy),
         "Increases the size of the rectangle.
 
 The left border is moved farther left and the right border is moved
@@ -1105,6 +1106,59 @@ public:
 
 };
 
+//---------------------------------------------------------------------------
+
+class wxPosition
+{
+public:
+    wxPosition(int row=0, int col=0);
+    ~wxPosition();
+
+    int GetRow() const;
+    int GetColumn() const;
+    int GetCol() const;
+    void SetRow(int row);
+    void SetColumn(int column);
+    void SetCol(int column);
+
+    %extend {
+        DocStr(__eq__, "Test for equality of wx.Position objects.", "");
+        bool __eq__(PyObject* other) {
+            wxPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPosition_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+
+        
+        DocStr(__ne__, "Test for inequality of wx.Position objects.", "");
+        bool __ne__(PyObject* other) {
+            wxPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPosition_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }
+    }
+
+    %nokwargs operator+;
+    %nokwargs operator-;
+    wxPosition operator+(const wxPosition& p) const;
+    wxPosition operator-(const wxPosition& p) const;
+    wxPosition operator+(const wxSize& s) const;
+    wxPosition operator-(const wxSize& s) const;
+
+    %property(row, GetRow, SetRow);
+    %property(col, GetCol, SetCol);
+};
+
+
+
 //---------------------------------------------------------------------------
 
 %immutable;