added wxBookCtrl::ChangeSelection() which is the same as SetSelection() but doesn't send the page change events (second part of patch 1553551)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,6 +21,9 @@
|
||||
class WXDLLEXPORT wxListView;
|
||||
class WXDLLEXPORT wxListEvent;
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
|
||||
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxListbook
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -65,7 +68,8 @@ public:
|
||||
const wxString& text,
|
||||
bool bSelect = false,
|
||||
int imageId = -1);
|
||||
virtual int SetSelection(size_t n);
|
||||
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
|
||||
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
|
||||
virtual void SetImageList(wxImageList *imageList);
|
||||
|
||||
virtual bool DeleteAllPages();
|
||||
@@ -81,6 +85,15 @@ protected:
|
||||
// return the page corresponding to the tab at the specified position
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
|
||||
int DoSetSelection(size_t nPage, int flags = 0);
|
||||
|
||||
void UpdateSelectedPage(size_t newsel);
|
||||
|
||||
void MakeChangedEvent(wxBookCtrlBaseEvent &event)
|
||||
{
|
||||
event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
|
||||
}
|
||||
|
||||
// event handlers
|
||||
void OnListSelected(wxListEvent& event);
|
||||
void OnSize(wxSizeEvent& event);
|
||||
@@ -120,9 +133,6 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListbookEvent)
|
||||
};
|
||||
|
||||
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
|
||||
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
|
||||
|
||||
typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
|
||||
|
||||
#define wxListbookEventHandler(func) \
|
||||
|
Reference in New Issue
Block a user