Some tweaks to reflect changes in wxWidgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,10 +70,19 @@ Events
|
||||
class wxHelpEvent : public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
// how was this help event generated?
|
||||
enum Origin
|
||||
{
|
||||
Origin_Unknown, // unrecognized event source
|
||||
Origin_Keyboard, // event generated from F1 key press
|
||||
Origin_HelpButton // event from [?] button on the title bar (Windows)
|
||||
};
|
||||
|
||||
DocCtorStr(
|
||||
wxHelpEvent(wxEventType type = wxEVT_NULL,
|
||||
wxWindowID winid = 0,
|
||||
const wxPoint& pt = wxDefaultPosition),
|
||||
const wxPoint& pt = wxDefaultPosition,
|
||||
Origin origin = Origin_Unknown ),
|
||||
"", "");
|
||||
|
||||
|
||||
@@ -105,6 +114,15 @@ appropriately.", "");
|
||||
void , SetTarget(const wxString& target),
|
||||
"Set an optional target to display help in. E.g. a window specification", "");
|
||||
|
||||
// optional indication of the event source
|
||||
DocDeclStr(
|
||||
Origin , GetOrigin() const,
|
||||
"Optiononal indication of the source of the event.", "");
|
||||
|
||||
DocDeclStr(
|
||||
void , SetOrigin(Origin origin),
|
||||
"", "");
|
||||
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
@@ -151,6 +151,12 @@ public:
|
||||
// cycle thru the pages
|
||||
void AdvanceSelection(bool forward = true);
|
||||
|
||||
DocDeclAStr(
|
||||
virtual int, HitTest(const wxPoint& pt, long* OUTPUT) const,
|
||||
"HitTest(Point pt) -> (tab, where)",
|
||||
"Returns the page/tab which is hit, and flags indicating where using
|
||||
wx.NB_HITTEST flags.", "");
|
||||
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
};
|
||||
@@ -233,14 +239,6 @@ public:
|
||||
// set the size of the tabs for wxNB_FIXEDWIDTH controls
|
||||
virtual void SetTabSize(const wxSize& sz);
|
||||
|
||||
// hit test, returns which tab is hit and, optionally, where (icon, label)
|
||||
// (not implemented on all platforms)
|
||||
DocDeclAStr(
|
||||
virtual int, HitTest(const wxPoint& pt, long* OUTPUT) const,
|
||||
"HitTest(Point pt) -> (tab, where)",
|
||||
"Returns the tab which is hit, and flags indicating where using
|
||||
wx.NB_HITTEST flags.", "");
|
||||
|
||||
// implement some base class functions
|
||||
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
|
||||
|
||||
|
Reference in New Issue
Block a user