SWIGged update for wxGTK (the last checkin was really for wxMSW...)

[wxWidgets.git] / wxPython / src / mac / cmndlgs.cpp

diff --git a/wxPython/src/mac/cmndlgs.cpp b/wxPython/src/mac/cmndlgs.cpp
index 4ffd5721e57bd46a340595013b848470f9e14f6f..323876d3e7babeac5aea78145cdde8ede0aec7b9 100644 (file)
--- a/wxPython/src/mac/cmndlgs.cpp
+++ b/wxPython/src/mac/cmndlgs.cpp
@@ -91,6 +91,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 
     // Put some wx default wxChar* values into wxStrings.
     DECLARE_DEF_STRING(FileSelectorPromptStr);
 
     // Put some wx default wxChar* values into wxStrings.
     DECLARE_DEF_STRING(FileSelectorPromptStr);

+    DECLARE_DEF_STRING(DirSelectorPromptStr);
+    DECLARE_DEF_STRING(DirDialogNameStr);

     DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
     DECLARE_DEF_STRING(GetTextFromUserPromptStr);
     DECLARE_DEF_STRING(MessageBoxCaptionStr);
     DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
     DECLARE_DEF_STRING(GetTextFromUserPromptStr);
     DECLARE_DEF_STRING(MessageBoxCaptionStr);


@@ -540,25 +542,30 @@ static void *SwigwxDirDialogTowxObject(void *ptr) {
     return (void *) dest;
 }
 
     return (void *) dest;
 }
 

-#define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
+#define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))

 static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;
 static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;

-    wxString * _arg1 = (wxString *) &wxPyFileSelectorPromptStr;
+    wxString * _arg1 = (wxString *) &wxPyDirSelectorPromptStr;

     wxString * _arg2 = (wxString *) &wxPyEmptyString;
     long  _arg3 = (long ) 0;
     wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
     wxString * _arg2 = (wxString *) &wxPyEmptyString;
     long  _arg3 = (long ) 0;
     wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;

+    wxSize * _arg5 = (wxSize *) &wxDefaultSize;
+    wxString * _arg6 = (wxString *) &wxPyDirDialogNameStr;

     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     wxPoint  temp;
     PyObject * _obj4 = 0;

-    char *_kwnames[] = { "parent","message","defaultPath","style","pos", NULL };
+    wxSize  temp0;
+    PyObject * _obj5 = 0;
+    PyObject * _obj6 = 0;
+    char *_kwnames[] = { "parent","message","defaultPath","style","pos","size","name", NULL };

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OOlO:new_wxDirDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_arg3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OOlOOO:new_wxDirDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_arg3,&_obj4,&_obj5,&_obj6)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -584,10 +591,22 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject
     _arg4 = &temp;
     if (! wxPoint_helper(_obj4, &_arg4))
         return NULL;
     _arg4 = &temp;
     if (! wxPoint_helper(_obj4, &_arg4))
         return NULL;

+}
+    if (_obj5)
+{
+    _arg5 = &temp0;
+    if (! wxSize_helper(_obj5, &_arg5))
+        return NULL;
+}
+    if (_obj6)
+{
+    _arg6 = wxString_in_helper(_obj6);
+    if (_arg6 == NULL)
+        return NULL;

 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
 }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxDirDialog *)new_wxDirDialog(_arg0,*_arg1,*_arg2,_arg3,*_arg4);
+    _result = (wxDirDialog *)new_wxDirDialog(_arg0,*_arg1,*_arg2,_arg3,*_arg4,*_arg5,*_arg6);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;


@@ -605,6 +624,10 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject
 {
     if (_obj2)
         delete _arg2;
 {
     if (_obj2)
         delete _arg2;

+}
+{
+    if (_obj6)
+        delete _arg6;

 }
     return _resultobj;
 }
 }
     return _resultobj;
 }


@@ -2766,7 +2789,7 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    _result = (wxFontDialog *)new_wxFontDialog(_arg0,_arg1);
+    _result = (wxFontDialog *)new_wxFontDialog(_arg0,*_arg1);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;