corrected findfirst/next on mac

[wxWidgets.git] / wxPython / src / gtk / sizers.cpp

diff --git a/wxPython/src/gtk/sizers.cpp b/wxPython/src/gtk/sizers.cpp
index c50cbc29894e0fbd0dca3b4062a250741b6f87b8..e4826be5d8badd4d82cb7e6fb89c636a3cf0a180 100644 (file)
--- a/wxPython/src/gtk/sizers.cpp
+++ b/wxPython/src/gtk/sizers.cpp
@@ -89,7 +89,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 #if PYTHON_API_VERSION >= 1009
     static char* wxStringErrorMsg = "String or Unicode type required";
 #else
-    static char* wxStringErrorMsg = "string type is required for parameter";
+    static char* wxStringErrorMsg = "String type required";
 #endif
 
 class wxPySizer : public wxSizer {
@@ -837,6 +837,41 @@ static void *SwigwxSizerTowxObject(void *ptr) {
     return (void *) dest;
 }
 
+static void  wxSizer__setOORInfo(wxSizer *self,PyObject * _self) {
+            self->SetClientObject(new wxPyClientData(_self));
+        }
+static PyObject *_wrap_wxSizer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxSizer * _arg0;
+    PyObject * _arg1;
+    PyObject * _argo0 = 0;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","_self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer__setOORInfo",_kwnames,&_argo0,&_obj1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__setOORInfo. Expected _wxSizer_p.");
+        return NULL;
+        }
+    }
+{
+  _arg1 = _obj1;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxSizer__setOORInfo(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 static void  wxSizer_Destroy(wxSizer *self) { delete self; }
 static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -1844,8 +1879,8 @@ static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *k
     return _resultobj;
 }
 
-#define wxPySizer__setSelf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setSelf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxPySizer__setCallbackInfo(_swigobj,_swigarg0,_swigarg1)  (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPySizer * _arg0;
     PyObject * _arg1;
@@ -1856,12 +1891,12 @@ static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObje
     char *_kwnames[] = { "self","self","_class", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPySizer__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPySizer__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPySizer_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPySizer__setSelf. Expected _wxPySizer_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPySizer__setCallbackInfo. Expected _wxPySizer_p.");
         return NULL;
         }
     }
@@ -1873,7 +1908,7 @@ static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObje
 }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        wxPySizer__setSelf(_arg0,_arg1,_arg2);
+        wxPySizer__setCallbackInfo(_arg0,_arg1,_arg2);
 
     wxPy_END_ALLOW_THREADS;
     if (PyErr_Occurred()) return NULL;
@@ -2885,7 +2920,7 @@ static PyMethodDef sizerscMethods[] = {
         { "wxBoxSizer_RecalcSizes", (PyCFunction) _wrap_wxBoxSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS },
         { "wxBoxSizer_GetOrientation", (PyCFunction) _wrap_wxBoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS },
         { "new_wxBoxSizer", (PyCFunction) _wrap_new_wxBoxSizer, METH_VARARGS | METH_KEYWORDS },
-        { "wxPySizer__setSelf", (PyCFunction) _wrap_wxPySizer__setSelf, METH_VARARGS | METH_KEYWORDS },
+        { "wxPySizer__setCallbackInfo", (PyCFunction) _wrap_wxPySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
         { "new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS },
         { "wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, METH_VARARGS | METH_KEYWORDS },
         { "wxSizer_SetSizeHints", (PyCFunction) _wrap_wxSizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS },
@@ -2912,6 +2947,7 @@ static PyMethodDef sizerscMethods[] = {
         { "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS },
         { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS },
         { "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS },
+        { "wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS },
         { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS },
         { "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS },
         { "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS },
@@ -2957,36 +2993,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_byte","_unsigned_char",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
-    { "_class_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
-    { "_class_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
-    { "_class_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer},
-    { "_class_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer},
-    { "_class_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
-    { "_class_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
-    { "_class_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
-    { "_class_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
-    { "_class_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer},
-    { "_class_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer},
-    { "_class_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer},
-    { "_class_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer},
-    { "_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
     { "_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
-    { "_class_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
-    { "_class_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
-    { "_class_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
-    { "_class_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
-    { "_class_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
-    { "_class_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
-    { "_class_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
-    { "_class_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
-    { "_class_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
-    { "_class_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
-    { "_class_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
-    { "_class_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
-    { "_class_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
-    { "_class_wxObject","_wxSizer",SwigwxSizerTowxObject},
-    { "_class_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
-    { "_class_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
     { "_size_t","_wxCoord",0},
     { "_size_t","_wxPrintQuality",0},
     { "_size_t","_time_t",0},
@@ -3002,7 +3009,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},
     { "_wxChar","_char",0},
-    { "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
     { "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
     { "_char","_wxChar",0},
     { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
@@ -3023,24 +3029,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_WXTYPE","_unsigned_short",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
-    { "_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
     { "_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
-    { "_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
     { "_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
-    { "_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
     { "_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
-    { "_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
     { "_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
-    { "_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
     { "_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
-    { "_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
     { "_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
-    { "_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
     { "_wxObject","_wxSizer",SwigwxSizerTowxObject},
-    { "_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
     { "_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
-    { "_class_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
-    { "_class_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_unsigned_char","_byte",0},
@@ -3054,8 +3050,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_short","_WXTYPE",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
-    { "_class_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
-    { "_class_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer},
     { "_wxWindowID","_wxCoord",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_time_t",0},
@@ -3090,17 +3084,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxCoord","_size_t",0},
     { "_wxCoord","_time_t",0},
     { "_wxCoord","_wxPrintQuality",0},
-    { "_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
     { "_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer},
-    { "_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer},
     { "_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer},
-    { "_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
     { "_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer},
-    { "_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
     { "_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer},
-    { "_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer},
     { "_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer},
-    { "_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer},
     { "_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer},
 {0,0,0}};