X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/118a41d993eaf5c14ad4a8d82c2fcb28c9630242..adaaa68635b4c8a4d8c5284add40366ea3eefb07:/interface/wx/utils.h?ds=sidebyside diff --git a/interface/wx/utils.h b/interface/wx/utils.h index d4b6d21b78..1254434a7b 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -78,7 +78,7 @@ public: /** Constructs a busy cursor object, calling wxBeginBusyCursor(). */ - wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR); + wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR); /** Destroys the busy cursor object, calling wxEndBusyCursor(). @@ -88,86 +88,6 @@ public: -/** - @class wxMouseState - - Represents the mouse state. - - The methods of this class generally mirror the corresponding methods of - wxMouseEvent. - - This class is implemented entirely in @, meaning no extra - library needs to be linked to use this class. - - @category{misc} - - @see wxGetMouseState() - */ -class wxMouseState -{ -public: - /** - Default constructor. - */ - wxMouseState(); - - /** - Returns X coordinate of the physical mouse event position. - */ - wxCoord GetX() const; - /** - Returns Y coordinate of the physical mouse event position. - */ - wxCoord GetY() const; - /** - Returns the physical mouse position. - */ - wxPoint GetPosition() const; - - /** - Returns @true if the left mouse button changed to down. - */ - bool LeftDown() const; - /** - Returns @true if the middle mouse button changed to down. - */ - bool MiddleDown() const; - /** - Returns @true if the right mouse button changed to down. - */ - bool RightDown() const; - /** - Returns @true if the first extra button mouse button changed to down. - */ - bool Aux1Down() const; - /** - Returns @true if the second extra button mouse button changed to down. - */ - bool Aux2Down() const; - - /** - Returns @true if the control key is down. - */ - bool ControlDown() const; - /** - Returns @true if the shift key is down. - */ - bool ShiftDown() const; - /** - Returns @true if the alt key is down. - */ - bool AltDown() const; - /** - Returns @true if the meta key is down. - */ - bool MetaDown() const; - /** - Same as MetaDown() under Mac systems, ControlDown() for the others. - */ - bool CmdDown() const; -}; - - // ============================================================================ // Global functions/macros // ============================================================================ @@ -510,7 +430,7 @@ void wxSetDisplayName(const wxString& displayName); By default, the functions strips both the mnemonics character (@c '&') which is used to indicate a keyboard shortkey, and the accelerators, which are used only in the menu items and are separated from the main text by the - @c \t (TAB) character. By using @a flags of @c wxStrip_Mnemonics or + @c \\t (TAB) character. By using @a flags of @c wxStrip_Mnemonics or @c wxStrip_Accel to strip only the former or the latter part, respectively. Notice that in most cases wxMenuItem::GetLabelFromText() or