From: Stefan Csomor Date: Mon, 13 Jan 2003 19:19:35 +0000 (+0000) Subject: cursor cleanup X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6b57b49ae3b298b63eb0df25ce4123eec6fc511e?ds=sidebyside cursor cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index e074c7fb31..66aadb5830 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -59,10 +59,6 @@ wxWindowList wxModelessWindows; static Point gs_lastWhere; static long gs_lastWhen = 0; -// cursor stuff -extern int wxBusyCursorCount; - - // ============================================================================ // wxTopLevelWindowMac implementation // ============================================================================ @@ -535,7 +531,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) if ( ev->what == mouseUp ) { wxTheApp->s_captureWindow = NULL ; - if ( wxBusyCursorCount == 0 ) + if ( !wxIsBusy() ) { m_cursor.MacInstall() ; } diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 7e68c37b03..aae75333d7 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -317,49 +317,38 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c } #endif // wxUSE_RESOURCES -int wxBusyCursorCount = 0; -extern CursHandle gMacCurrentCursor ; -CursHandle gMacStoredActiveCursor = NULL ; +int gs_wxBusyCursorCount = 0; +extern wxCursor gMacCurrentCursor ; +wxCursor gMacStoredActiveCursor ; // Set the cursor to the busy cursor for all windows void wxBeginBusyCursor(wxCursor *cursor) { - wxBusyCursorCount ++; - if (wxBusyCursorCount == 1) + if (gs_wxBusyCursorCount++ == 0) { gMacStoredActiveCursor = gMacCurrentCursor ; - ::SetCursor( *::GetCursor( watchCursor ) ) ; - } - else - { - // TODO + cursor->MacInstall() ; } + //else: nothing to do, already set } // Restore cursor to normal void wxEndBusyCursor() { - if (wxBusyCursorCount == 0) - return; + wxCHECK_RET( gs_wxBusyCursorCount > 0, + wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); - wxBusyCursorCount --; - if (wxBusyCursorCount == 0) + if (--gs_wxBusyCursorCount == 0) { - if ( gMacStoredActiveCursor ) - ::SetCursor( *gMacStoredActiveCursor ) ; - else - { - Cursor MacArrow ; - ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ; - } - gMacStoredActiveCursor = NULL ; + gMacStoredActiveCursor.MacInstall() ; + gMacStoredActiveCursor = wxNullCursor ; } } // TRUE if we're between the above two calls bool wxIsBusy() { - return (wxBusyCursorCount > 0); + return (gs_wxBusyCursorCount > 0); } wxString wxMacFindFolder( short vol, diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 0528ad58db..61a23f38cb 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -1478,7 +1478,6 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa return FALSE ; } -extern int wxBusyCursorCount ; static wxWindow *gs_lastWhich = NULL; bool wxWindowMac::MacSetupCursor( const wxPoint& pt) diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index e074c7fb31..66aadb5830 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -59,10 +59,6 @@ wxWindowList wxModelessWindows; static Point gs_lastWhere; static long gs_lastWhen = 0; -// cursor stuff -extern int wxBusyCursorCount; - - // ============================================================================ // wxTopLevelWindowMac implementation // ============================================================================ @@ -535,7 +531,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr ) if ( ev->what == mouseUp ) { wxTheApp->s_captureWindow = NULL ; - if ( wxBusyCursorCount == 0 ) + if ( !wxIsBusy() ) { m_cursor.MacInstall() ; } diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index 7e68c37b03..aae75333d7 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -317,49 +317,38 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c } #endif // wxUSE_RESOURCES -int wxBusyCursorCount = 0; -extern CursHandle gMacCurrentCursor ; -CursHandle gMacStoredActiveCursor = NULL ; +int gs_wxBusyCursorCount = 0; +extern wxCursor gMacCurrentCursor ; +wxCursor gMacStoredActiveCursor ; // Set the cursor to the busy cursor for all windows void wxBeginBusyCursor(wxCursor *cursor) { - wxBusyCursorCount ++; - if (wxBusyCursorCount == 1) + if (gs_wxBusyCursorCount++ == 0) { gMacStoredActiveCursor = gMacCurrentCursor ; - ::SetCursor( *::GetCursor( watchCursor ) ) ; - } - else - { - // TODO + cursor->MacInstall() ; } + //else: nothing to do, already set } // Restore cursor to normal void wxEndBusyCursor() { - if (wxBusyCursorCount == 0) - return; + wxCHECK_RET( gs_wxBusyCursorCount > 0, + wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); - wxBusyCursorCount --; - if (wxBusyCursorCount == 0) + if (--gs_wxBusyCursorCount == 0) { - if ( gMacStoredActiveCursor ) - ::SetCursor( *gMacStoredActiveCursor ) ; - else - { - Cursor MacArrow ; - ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ; - } - gMacStoredActiveCursor = NULL ; + gMacStoredActiveCursor.MacInstall() ; + gMacStoredActiveCursor = wxNullCursor ; } } // TRUE if we're between the above two calls bool wxIsBusy() { - return (wxBusyCursorCount > 0); + return (gs_wxBusyCursorCount > 0); } wxString wxMacFindFolder( short vol, diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 0528ad58db..61a23f38cb 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -1478,7 +1478,6 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa return FALSE ; } -extern int wxBusyCursorCount ; static wxWindow *gs_lastWhich = NULL; bool wxWindowMac::MacSetupCursor( const wxPoint& pt)