From 6aaca5bac6f3ad13add44c220163fda423c40351 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 29 Jul 2006 21:49:25 +0000 Subject: [PATCH] Various little tweaks to get up to date with CVS git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/__init__.py | 3 +-- wxPython/src/_cmndlgs.i | 3 ++- wxPython/src/_control.i | 16 ++++++++++++++++ wxPython/src/_defs.i | 2 ++ wxPython/src/_gdicmn.i | 5 +++++ wxPython/src/_log.i | 7 +++++++ wxPython/src/_picker.i | 10 ++++++++++ wxPython/src/_toplvl.i | 19 +++++++++++++++++++ wxPython/src/_window.i | 24 ++++-------------------- wxPython/src/grid.i | 6 ++++++ 10 files changed, 72 insertions(+), 23 deletions(-) diff --git a/wxPython/src/__init__.py b/wxPython/src/__init__.py index 9c45a5b121..53a578b4ad 100644 --- a/wxPython/src/__init__.py +++ b/wxPython/src/__init__.py @@ -52,8 +52,7 @@ if 'wxMSW' in PlatformInfo: import wx._core __docfilter__ = wx._core.__DocFilter(globals()) -__all__ += [name for name in dir(wx._core) - if not (name.startswith('__') and name.endswith('__'))] +__all__ += [name for name in dir(wx._core) if not name.startswith('_')] diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index 8f96125982..255839ecd3 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -201,6 +201,7 @@ enum { wxFD_FILE_MUST_EXIST, wxFD_MULTIPLE, wxFD_CHANGE_DIR, + wxFD_PREVIEW, wxFD_DEFAULT_STYLE, }; @@ -458,7 +459,7 @@ public: DocDeclStr( int , GetSelection(), - "Get the index of teh currently selected item.", ""); + "Get the index of the currently selected item.", ""); DocDeclStr( wxString , GetStringSelection(), diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i index 85d8175ffd..adf3b06174 100644 --- a/wxPython/src/_control.i +++ b/wxPython/src/_control.i @@ -67,6 +67,22 @@ __init__ as a plain old wx.Control is not very useful.", ""); "Do the 2nd phase and create the GUI control.", ""); + DocDeclStr( + int , GetAlignment() const, + "Get the control alignment (left/right/centre, top/bottom/centre)", ""); + + + DocDeclStr( + static wxString , GetLabelText(const wxString& label), + "Get the string without mnemonic characters ('&')", ""); + + + DocDeclStr( + wxString , GetLabelText() const, + "Get just the text of the label, without mnemonic characters ('&')", ""); + + + DocDeclStr( void , Command(wxCommandEvent& event), "Simulates the effect of the user issuing a command to the item. diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 1e1dfc9fb2..b9b3c361c9 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -599,6 +599,8 @@ enum { wxID_HELP_COMMANDS, wxID_HELP_PROCEDURES, wxID_HELP_CONTEXT, + wxID_HELP_INDEX, + wxID_HELP_SEARCH, wxID_CLOSE_ALL, wxID_PREFERENCES, diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index 6e7e24241f..ba3aaa6970 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -176,6 +176,11 @@ than the corresponding dimensions of the size.", ""); "Decrements this object so that both of its dimensions are not greater than the corresponding dimensions of the size.", ""); + + DocDeclStr( + void , Scale(float xscale, float yscale), + "Scales the dimensions of this object by the given factors.", ""); + DocDeclStr( void, Set(int w, int h), "Set both width and height.", ""); diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i index f026dead0a..f02bf3c39c 100644 --- a/wxPython/src/_log.i +++ b/wxPython/src/_log.i @@ -106,6 +106,13 @@ public: // current is NULL? static void DontCreateOnDemand(); + // log the count of repeating messages instead of logging the messages + // multiple times + static void SetRepetitionCounting(bool bRepetCounting = true); + + // gets duplicate counting status + static bool GetRepetitionCounting(); + // trace mask (see wxTraceXXX constants for details) static void SetTraceMask(wxTraceMask ulMask); diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i index 78eb6632c2..5314d3686b 100644 --- a/wxPython/src/_picker.i +++ b/wxPython/src/_picker.i @@ -68,6 +68,16 @@ The value passed to this function must be >= 1.", ""); int , GetTextCtrlProportion() const, "Returns the proportion between the text control and the picker.", ""); + + DocDeclStr( + void , SetPickerCtrlProportion(int prop), + "Sets the proportion value of the picker.", ""); + + DocDeclStr( + int , GetPickerCtrlProportion() const, + "Gets the proportion value of the picker.", ""); + + DocDeclStr( bool , IsTextCtrlGrowable() const, "", ""); diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index a99ce0c362..fbf4fe4fdf 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -174,6 +174,25 @@ public: virtual bool SetTransparent(byte alpha); virtual bool CanSetTransparent(); + + + DocDeclStr( + virtual wxWindow *, GetDefaultItem() const, + "Get the default child of this parent, i.e. the one which is activated +by pressing such as the OK button on a wx.Dialog.", ""); + + DocDeclStr( + virtual wxWindow *, SetDefaultItem(wxWindow * child), + "Set this child as default, return the old default.", ""); + + DocDeclStr( + virtual void , SetTmpDefaultItem(wxWindow * win), + "Set this child as temporary default", ""); + + DocDeclStr( + virtual wxWindow *, GetTmpDefaultItem() const, + "Return the temporary default item, which can be None.", ""); + }; diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index f90a6442b9..2e014bcd13 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -862,25 +862,6 @@ it.", ""); - - DocDeclStr( - virtual wxWindow *, GetDefaultItem() const, - "Get the default child of this parent, i.e. the one which is activated -by pressing such as the OK button on a wx.Dialog.", ""); - - DocDeclStr( - virtual wxWindow *, SetDefaultItem(wxWindow * child), - "Set this child as default, return the old default.", ""); - - DocDeclStr( - virtual void , SetTmpDefaultItem(wxWindow * win), - "Set this child as temporary default", ""); - - DocDeclStr( - virtual wxWindow *, GetTmpDefaultItem() const, - "Return the temporary default item, which can be None.", ""); - - DocDeclAStr( virtual bool , Navigate(int flags = wxNavigationKeyEvent::IsForward), @@ -1626,7 +1607,10 @@ mouse cursor will be used.", ""); bool PopupMenu(wxMenu *menu, const wxPoint& pos=wxDefaultPosition); - + DocDeclStr( + virtual bool , HasMultiplePages() const, + "", ""); + %extend { DocStr(GetHandle, diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index e2c63de53a..6c78cc4bb7 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -1804,6 +1804,12 @@ public: wxString GetRowLabelValue( int row ); wxString GetColLabelValue( int col ); wxColour GetGridLineColour(); + + virtual wxPen GetDefaultGridLinePen(); + virtual wxPen GetRowGridLinePen(int row); + virtual wxPen GetColGridLinePen(int col); + + wxColour GetCellHighlightColour(); int GetCellHighlightPenWidth(); int GetCellHighlightROPenWidth(); -- 2.45.2