Some new def's, parameters, methods, etc. resulting from recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3e3a3e177c
commit
8815349a37
@ -51,10 +51,12 @@
|
||||
%rename(RA_VERTICAL) wxRA_VERTICAL;
|
||||
%rename(RA_SPECIFY_ROWS) wxRA_SPECIFY_ROWS;
|
||||
%rename(RA_SPECIFY_COLS) wxRA_SPECIFY_COLS;
|
||||
%rename(RA_USE_CHECKBOX) wxRA_USE_CHECKBOX;
|
||||
%rename(RB_GROUP) wxRB_GROUP;
|
||||
%rename(RB_SINGLE) wxRB_SINGLE;
|
||||
%rename(SB_HORIZONTAL) wxSB_HORIZONTAL;
|
||||
%rename(SB_VERTICAL) wxSB_VERTICAL;
|
||||
%rename(RB_USE_CHECKBOX) wxRB_USE_CHECKBOX;
|
||||
%rename(ST_SIZEGRIP) wxST_SIZEGRIP;
|
||||
%rename(ST_NO_AUTORESIZE) wxST_NO_AUTORESIZE;
|
||||
%rename(FLOOD_SURFACE) wxFLOOD_SURFACE;
|
||||
|
@ -708,14 +708,15 @@ public:
|
||||
inline wxDateTime& operator-=(const wxDateSpan& diff);
|
||||
|
||||
|
||||
// inline bool operator<(const wxDateTime& dt) const;
|
||||
// inline bool operator<=(const wxDateTime& dt) const;
|
||||
// inline bool operator>(const wxDateTime& dt) const;
|
||||
// inline bool operator>=(const wxDateTime& dt) const;
|
||||
// inline bool operator==(const wxDateTime& dt) const;
|
||||
// inline bool operator!=(const wxDateTime& dt) const;
|
||||
|
||||
%nokwargs __add__;
|
||||
%nokwargs __sub__;
|
||||
%nokwargs __lt__;
|
||||
%nokwargs __le__;
|
||||
%nokwargs __gt__;
|
||||
%nokwargs __ge__;
|
||||
%nokwargs __eq__;
|
||||
%nokwargs __ne__;
|
||||
%extend {
|
||||
wxDateTime __add__(const wxTimeSpan& other) { return *self + other; }
|
||||
wxDateTime __add__(const wxDateSpan& other) { return *self + other; }
|
||||
@ -724,14 +725,9 @@ public:
|
||||
wxDateTime __sub__(const wxTimeSpan& other) { return *self - other; }
|
||||
wxDateTime __sub__(const wxDateSpan& other) { return *self - other; }
|
||||
|
||||
// bool __lt__(const wxDateTime* other) { return other ? (*self < *other) : false; }
|
||||
// bool __le__(const wxDateTime* other) { return other ? (*self <= *other) : false; }
|
||||
// bool __gt__(const wxDateTime* other) { return other ? (*self > *other) : true; }
|
||||
// bool __ge__(const wxDateTime* other) { return other ? (*self >= *other) : true; }
|
||||
|
||||
|
||||
// These fall back to just comparing pointers if other is NULL, or if
|
||||
// either operand is invalid.
|
||||
// either operand is invalid. This allows Python comparrisons to None
|
||||
// to not assert and to return a sane value for the compare.
|
||||
bool __lt__(const wxDateTime* other) {
|
||||
if (!other || !self->IsValid() || !other->IsValid()) return self < other;
|
||||
return (*self < *other);
|
||||
@ -759,6 +755,9 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// conversion from text: all conversions from text return -1 on failure,
|
||||
|
@ -442,10 +442,12 @@ enum {
|
||||
wxRA_VERTICAL,
|
||||
wxRA_SPECIFY_ROWS,
|
||||
wxRA_SPECIFY_COLS,
|
||||
wxRA_USE_CHECKBOX,
|
||||
wxRB_GROUP,
|
||||
wxRB_SINGLE,
|
||||
wxSB_HORIZONTAL,
|
||||
wxSB_VERTICAL,
|
||||
wxRB_USE_CHECKBOX,
|
||||
wxST_SIZEGRIP,
|
||||
wxST_NO_AUTORESIZE,
|
||||
|
||||
|
@ -40,7 +40,9 @@ bool wxIsStockLabel(wxWindowID id, const wxString& label);
|
||||
|
||||
// Returns label that should be used for given stock UI element (e.g. "&OK"
|
||||
// for wxID_OK):
|
||||
wxString wxGetStockLabel(wxWindowID id);
|
||||
wxString wxGetStockLabel(wxWindowID id,
|
||||
bool withCodes = true,
|
||||
wxString accelerator = wxPyEmptyString);
|
||||
|
||||
|
||||
MustHaveApp(wxBell);
|
||||
|
@ -458,10 +458,8 @@ public:
|
||||
// the item will be shown in bold
|
||||
void SetItemBold(const wxTreeItemId& item, bool bold = true);
|
||||
|
||||
#ifdef __WXMSW__
|
||||
// the item will be shown with a drop highlight
|
||||
void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true);
|
||||
#endif
|
||||
|
||||
// set the items text colour
|
||||
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
|
||||
|
@ -1215,7 +1215,7 @@ to the window.", "");
|
||||
|
||||
|
||||
DocDeclStr(
|
||||
void , RefreshRect(const wxRect& rect),
|
||||
void , RefreshRect(const wxRect& rect, bool eraseBackground = true),
|
||||
"Redraws the contents of the given rectangle: the area inside it will
|
||||
be repainted. This is the same as Refresh but has a nicer syntax.", "");
|
||||
|
||||
|
@ -67,10 +67,12 @@ wxRA_HORIZONTAL = wx._core.RA_HORIZONTAL
|
||||
wxRA_VERTICAL = wx._core.RA_VERTICAL
|
||||
wxRA_SPECIFY_ROWS = wx._core.RA_SPECIFY_ROWS
|
||||
wxRA_SPECIFY_COLS = wx._core.RA_SPECIFY_COLS
|
||||
wxRA_USE_CHECKBOX = wx._core.RA_USE_CHECKBOX
|
||||
wxRB_GROUP = wx._core.RB_GROUP
|
||||
wxRB_SINGLE = wx._core.RB_SINGLE
|
||||
wxSB_HORIZONTAL = wx._core.SB_HORIZONTAL
|
||||
wxSB_VERTICAL = wx._core.SB_VERTICAL
|
||||
wxRB_USE_CHECKBOX = wx._core.RB_USE_CHECKBOX
|
||||
wxST_SIZEGRIP = wx._core.ST_SIZEGRIP
|
||||
wxST_NO_AUTORESIZE = wx._core.ST_NO_AUTORESIZE
|
||||
wxFLOOD_SURFACE = wx._core.FLOOD_SURFACE
|
||||
|
Loading…
Reference in New Issue
Block a user