From: Robin Dunn Date: Sun, 5 May 2002 04:17:27 +0000 (+0000) Subject: Various minor tweaks and updates X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/daa3eac94c219acca125c79177ac662961850929 Various minor tweaks and updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/bitmaps/splash.gif b/wxPython/demo/bitmaps/splash.gif index f1d3b2cf75..e0b7de3585 100644 Binary files a/wxPython/demo/bitmaps/splash.gif and b/wxPython/demo/bitmaps/splash.gif differ diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index d41edc1b79..318c3fc3ea 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -10,7 +10,7 @@ will be created. import sys, os, string KEEP_TEMPS = 0 -ISCC = r"C:\TOOLS\InnoSetup2Ex\ISCC.exe %s" +ISCC = r"D:\TOOLS\InnoSetup2Ex\ISCC.exe %s" #---------------------------------------------------------------------- @@ -21,7 +21,7 @@ ISS_Template = r''' AppName = wxPython AppVerName = wxPython %(VERSION)s for Python %(PYTHONVER)s OutputBaseFilename = wxPython-%(VERSION)s-%(PYVER)s -AppCopyright = Copyright © 2001 Total Control Software +AppCopyright = Copyright © 2002 Total Control Software DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s AlwaysCreateUninstallIcon = yes diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index ce213ca94b..fad06d17df 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -452,6 +452,7 @@ enum { wxPD_REMAINING_TIME, wxDD_NEW_DIR_BUTTON, + wxDD_DEFAULT_STYLE, wxMENU_TEAROFF, wxMB_DOCKABLE, diff --git a/wxPython/src/cmndlgs.i b/wxPython/src/cmndlgs.i index 5ab14a8693..c87f85753d 100644 --- a/wxPython/src/cmndlgs.i +++ b/wxPython/src/cmndlgs.i @@ -41,6 +41,8 @@ %{ // 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); @@ -80,10 +82,12 @@ public: class wxDirDialog : public wxDialog { public: wxDirDialog(wxWindow* parent, - const wxString& message = wxPyFileSelectorPromptStr, + const wxString& message = wxPyDirSelectorPromptStr, const wxString& defaultPath = wxPyEmptyString, long style = 0, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + const wxString& name = wxPyDirDialogNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index c8049586dd..235a17c705 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -86,7 +86,7 @@ wxString wxSaveFileSelector(const wxString& what, wxString wxDirSelector(const wxString& message = wxPyDirSelectorPromptStr, const wxString& defaultPath = wxPyEmptyString, - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON, + long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL); @@ -303,6 +303,15 @@ enum wxSystemFeature wxSYS_CAN_ICONIZE_FRAME }; +// values for different screen designs +enum wxSystemScreen +{ + wxSYS_SCREEN_NONE = 0, // not yet defined + wxSYS_SCREEN_DESKTOP, // >= 800x600 + wxSYS_SCREEN_SMALL, // >= 640x480 + wxSYS_SCREEN_PDA, // >= 320x240 + wxSYS_SCREEN_TINY // < +}; class wxSystemSettings { @@ -319,6 +328,13 @@ public: // return true if the port has certain feature static bool HasFeature(wxSystemFeature index); +// // Get system screen design (desktop, pda, ..) used for +// // laying out various dialogs. +// static wxSystemScreen GetScreen(); + +// // Override default. +// static void SetScreen( wxSystemScreen screen ); + }; diff --git a/wxPython/src/msw/cmndlgs.cpp b/wxPython/src/msw/cmndlgs.cpp index bc8fe68a71..e8b1862660 100644 --- a/wxPython/src/msw/cmndlgs.cpp +++ b/wxPython/src/msw/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/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index 38b1447448..144f2a3864 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/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; @@ -10380,6 +10380,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/msw/misc2.py b/wxPython/src/msw/misc2.py index 39518f1b03..9bb9b56c59 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -1269,6 +1269,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/msw/wx.cpp b/wxPython/src/msw/wx.cpp index cc298bcb4f..85057aa2b9 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -2131,6 +2131,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/msw/wx.py b/wxPython/src/msw/wx.py index 55d3282d8e..f9a120178d 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -416,6 +416,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 diff --git a/wxPython/wxPython/lib/PyCrust/introspect.py b/wxPython/wxPython/lib/PyCrust/introspect.py index 39561ade2c..bcb4fa31a1 100644 --- a/wxPython/wxPython/lib/PyCrust/introspect.py +++ b/wxPython/wxPython/lib/PyCrust/introspect.py @@ -154,7 +154,9 @@ def getCallTip(command='', locals=None): else: # Drop the first argument. argspec = '(' + ','.join(temp[1:]).lstrip() tip1 = name + argspec - doc = inspect.getdoc(object) + doc = '' + if callable(object): + doc = inspect.getdoc(object) if doc: # tip2 is the first separated line of the docstring, like: # "Return call tip text for a command."