X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eebe401675d1c558516d20506a4e43cccb36d182..df5ddbca48c63ffae5cfd044a92d7352245e8c86:/include/wx/cursor.h diff --git a/include/wx/cursor.h b/include/wx/cursor.h index f163125fa6..e4cf1106df 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -18,26 +18,43 @@ #endif #include "wx/utils.h" + /* This is a small class which can be used by all ports to temporarily suspend the busy cursor. Useful in modal dialogs. + + Actually that is not (any longer) quite true.. currently it is + only used in wxGTK Dialog::ShowModal() and now uses static + wxBusyCursor methods that are only implemented for wxGTK so far. + The BusyCursor handling code should probably be implemented in + common code somewhere instead of the separate implementations we + currently have. Also the name BusyCursorSuspender is a little + misleading since it doesn't actually suspend the BusyCursor, just + masks one that is already showing. + If another call to wxBeginBusyCursor is made while this is active + the Busy Cursor will again be shown. But at least now it doesn't + interfere with the state of wxIsBusy() -- RL + */ class wxBusyCursorSuspender { public: - wxBusyCursorSuspender() - { - m_wasBusy = wxIsBusy(); - if(m_wasBusy) - wxEndBusyCursor(); - } - ~wxBusyCursorSuspender() - { - if(m_wasBusy) - wxBeginBusyCursor(); - } - private: - bool m_wasBusy; + wxBusyCursorSuspender() + { + if( wxIsBusy() ) + { + wxSetCursor( wxBusyCursor::GetStoredCursor() ); + wxYield(); + } + } + ~wxBusyCursorSuspender() + { + if( wxIsBusy() ) + { + wxSetCursor( wxBusyCursor::GetBusyCursor() ); + wxYield(); + } + } }; #endif // _WX_CURSOR_H_BASE_