diff --git a/wxPython/src/mac/cmndlgs.cpp b/wxPython/src/mac/cmndlgs.cpp index 4ffd5721e5..17abf00ef2 100644 --- 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); + DECLARE_DEF_STRING(DirSelectorPromptStr); + DECLARE_DEF_STRING(DirDialogNameStr); DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr); DECLARE_DEF_STRING(GetTextFromUserPromptStr); DECLARE_DEF_STRING(MessageBoxCaptionStr); @@ -540,25 +542,30 @@ static void *SwigwxDirDialogTowxObject(void *ptr) { 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; - wxString * _arg1 = (wxString *) &wxPyFileSelectorPromptStr; + wxString * _arg1 = (wxString *) &wxPyDirSelectorPromptStr; 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; - 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; - 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; } @@ -584,10 +591,22 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject _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(); - _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; @@ -605,6 +624,10 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject { if (_obj2) delete _arg2; +} +{ + if (_obj6) + delete _arg6; } return _resultobj; } diff --git a/wxPython/src/mac/misc2.cpp b/wxPython/src/mac/misc2.cpp index d9485a058b..fa0fb99cfc 100644 --- a/wxPython/src/mac/misc2.cpp +++ b/wxPython/src/mac/misc2.cpp @@ -520,7 +520,7 @@ static PyObject *_wrap_wxDirSelector(PyObject *self, PyObject *args, PyObject *k wxString * _result; wxString * _arg0 = (wxString *) &wxPyDirSelectorPromptStr; wxString * _arg1 = (wxString *) &wxPyEmptyString; - long _arg2 = (long ) wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxDD_NEW_DIR_BUTTON; + long _arg2 = (long ) wxDD_DEFAULT_STYLE; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxWindow * _arg4 = (wxWindow *) NULL; PyObject * _obj0 = 0; @@ -10314,6 +10314,11 @@ SWIGEXPORT(void) initmisc2c() { PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS)); PyDict_SetItemString(d,"wxSYS_CAN_DRAW_FRAME_DECORATIONS", PyInt_FromLong((long) wxSYS_CAN_DRAW_FRAME_DECORATIONS)); PyDict_SetItemString(d,"wxSYS_CAN_ICONIZE_FRAME", PyInt_FromLong((long) wxSYS_CAN_ICONIZE_FRAME)); + PyDict_SetItemString(d,"wxSYS_SCREEN_NONE", PyInt_FromLong((long) wxSYS_SCREEN_NONE)); + PyDict_SetItemString(d,"wxSYS_SCREEN_DESKTOP", PyInt_FromLong((long) wxSYS_SCREEN_DESKTOP)); + PyDict_SetItemString(d,"wxSYS_SCREEN_SMALL", PyInt_FromLong((long) wxSYS_SCREEN_SMALL)); + PyDict_SetItemString(d,"wxSYS_SCREEN_PDA", PyInt_FromLong((long) wxSYS_SCREEN_PDA)); + PyDict_SetItemString(d,"wxSYS_SCREEN_TINY", PyInt_FromLong((long) wxSYS_SCREEN_TINY)); PyDict_SetItemString(d,"wxLOG_FatalError", PyInt_FromLong((long) wxLOG_FatalError)); PyDict_SetItemString(d,"wxLOG_Error", PyInt_FromLong((long) wxLOG_Error)); PyDict_SetItemString(d,"wxLOG_Warning", PyInt_FromLong((long) wxLOG_Warning)); diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py index 1475eefeb4..aad17d6eac 100644 --- a/wxPython/src/mac/misc2.py +++ b/wxPython/src/mac/misc2.py @@ -1263,6 +1263,11 @@ wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS wxSYS_CAN_DRAW_FRAME_DECORATIONS = misc2c.wxSYS_CAN_DRAW_FRAME_DECORATIONS wxSYS_CAN_ICONIZE_FRAME = misc2c.wxSYS_CAN_ICONIZE_FRAME +wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE +wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP +wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL +wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA +wxSYS_SCREEN_TINY = misc2c.wxSYS_SCREEN_TINY wxLOG_FatalError = misc2c.wxLOG_FatalError wxLOG_Error = misc2c.wxLOG_Error wxLOG_Warning = misc2c.wxLOG_Warning diff --git a/wxPython/src/mac/wx.cpp b/wxPython/src/mac/wx.cpp index aaf1ea6aea..4e95ce99d1 100644 --- a/wxPython/src/mac/wx.cpp +++ b/wxPython/src/mac/wx.cpp @@ -2070,6 +2070,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxPD_ESTIMATED_TIME", PyInt_FromLong((long) wxPD_ESTIMATED_TIME)); PyDict_SetItemString(d,"wxPD_REMAINING_TIME", PyInt_FromLong((long) wxPD_REMAINING_TIME)); PyDict_SetItemString(d,"wxDD_NEW_DIR_BUTTON", PyInt_FromLong((long) wxDD_NEW_DIR_BUTTON)); + PyDict_SetItemString(d,"wxDD_DEFAULT_STYLE", PyInt_FromLong((long) wxDD_DEFAULT_STYLE)); PyDict_SetItemString(d,"wxMENU_TEAROFF", PyInt_FromLong((long) wxMENU_TEAROFF)); PyDict_SetItemString(d,"wxMB_DOCKABLE", PyInt_FromLong((long) wxMB_DOCKABLE)); PyDict_SetItemString(d,"wxNO_FULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxNO_FULL_REPAINT_ON_RESIZE)); diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py index 64ef51ce33..1e76021ea0 100644 --- a/wxPython/src/mac/wx.py +++ b/wxPython/src/mac/wx.py @@ -410,6 +410,7 @@ wxPD_ELAPSED_TIME = wxc.wxPD_ELAPSED_TIME wxPD_ESTIMATED_TIME = wxc.wxPD_ESTIMATED_TIME wxPD_REMAINING_TIME = wxc.wxPD_REMAINING_TIME wxDD_NEW_DIR_BUTTON = wxc.wxDD_NEW_DIR_BUTTON +wxDD_DEFAULT_STYLE = wxc.wxDD_DEFAULT_STYLE wxMENU_TEAROFF = wxc.wxMENU_TEAROFF wxMB_DOCKABLE = wxc.wxMB_DOCKABLE wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE