merge from 2.8 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,6 +37,7 @@ enum Propagation_state
|
||||
|
||||
wxEventType wxNewEventType();
|
||||
|
||||
%constant wxEventType wxEVT_ANY;
|
||||
|
||||
%constant wxEventType wxEVT_NULL;
|
||||
%constant wxEventType wxEVT_FIRST;
|
||||
@@ -1086,6 +1087,12 @@ have been accumulated before scrolling.", "");
|
||||
taken, and one such action (for example, scrolling one increment)
|
||||
should occur for each delta.", "");
|
||||
|
||||
DocDeclStr(
|
||||
int , GetWheelAxis() const,
|
||||
"Gets the axis the wheel operation concerns, 0 being the y axis as on
|
||||
most mouse wheels, 1 is the x axis for things like MightyMouse scrolls
|
||||
or horizontal trackpad scrolling.", "");
|
||||
|
||||
|
||||
DocDeclStr(
|
||||
int , GetLinesPerAction() const,
|
||||
@@ -2675,5 +2682,20 @@ internally.", "");
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
DocStr(wxEventBlocker,
|
||||
"Helper class to temporarily disable event handling for a window.", "");
|
||||
|
||||
class wxEventBlocker : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
wxEventBlocker(wxWindow *win, wxEventType type = wxEVT_ANY);
|
||||
virtual ~wxEventBlocker();
|
||||
|
||||
void Block(wxEventType type);
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user