reenabled some methods for wxPython on wxGTK

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

diff --git a/utils/wxPython/src/gtk/windows.cpp b/utils/wxPython/src/gtk/windows.cpp
index 29e66edbb813b7eaf089f6b80080246904ea5b2e..55955da9fe7f66885dce4277c5d32fea7b44c7b2 100644 (file)
--- a/utils/wxPython/src/gtk/windows.cpp
+++ b/utils/wxPython/src/gtk/windows.cpp
@@ -1441,6 +1441,35 @@ static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+#define wxWindow_Move(_swigobj,_swigarg0)  (_swigobj->Move(_swigarg0))
+static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_Move",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    wxWindow_Move(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -2106,6 +2135,35 @@ static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
+#define wxWindow_SetClientSize(_swigobj,_swigarg0)  (_swigobj->SetClientSize(_swigarg0))
+static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetClientSize",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    wxWindow_SetClientSize(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxWindow_SetCursor(_swigobj,_swigarg0)  (_swigobj->SetCursor(_swigarg0))
 static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
@@ -4433,6 +4491,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_Show", _wrap_wxWindow_Show, 1 },
         { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 },
         { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 },
+        { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 },
         { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, 1 },
         { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 },
         { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 },
@@ -4457,6 +4516,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
         { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
         { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
+        { "wxWindow_Move", _wrap_wxWindow_Move, 1 },
         { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 },
         { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
         { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },

diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py
index 8f5bf466b72321e35ac97b181fa4e83f1cdc122b..1a1e4a3bb2314041d32f22db56011492e2df547f 100644 (file)
--- a/utils/wxPython/src/gtk/windows.py
+++ b/utils/wxPython/src/gtk/windows.py
@@ -192,6 +192,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def MoveXY(self,arg0,arg1):
         val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1)
         return val
+    def Move(self,arg0):
+        val = windowsc.wxWindow_Move(self.this,arg0.this)
+        return val
     def PopupMenu(self,arg0,arg1,arg2):
         val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)
         return val
@@ -272,6 +275,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetClientSizeWH(self,arg0,arg1):
         val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1)
         return val
+    def SetClientSize(self,arg0):
+        val = windowsc.wxWindow_SetClientSize(self.this,arg0.this)
+        return val
     def SetCursor(self,arg0):
         val = windowsc.wxWindow_SetCursor(self.this,arg0.this)
         return val

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index f11e6c859402bcd697fa42f85175987d6129216a..8243a53ec47241f2499b8e730d0c771c962eea65 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -120,9 +120,7 @@ public:
     void Lower();
     void MakeModal(bool flag);
     %name(MoveXY)void Move(int x, int y);
-#ifndef __WXGTK__
     void Move(const wxPoint& point);
-#endif
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);
@@ -164,9 +162,7 @@ public:
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
-#ifndef __WXGTK__
     void SetClientSize(const wxSize& size);
-#endif
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);
@@ -380,7 +376,11 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.14  1999/02/23 23:48:33  RD
+// reenabled some methods for wxPython on wxGTK
+//
 // Revision 1.13  1999/02/20 10:02:38  RD
+//
 // Changes needed to enable wxGTK compatibility.
 //
 // Revision 1.12  1999/02/20 09:03:03  RD