Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got a new idea to do cursors, including global

Browse Source 
ones and busy etc.
  Fixed an assert in UserScaler from PS code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-26 20:40:04 +00:00
parent 14906731b1
commit 238d735dc2
14 changed files with 112 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gtk/cursor.cpp
View File

@@ -16,6 +16,13 @@
#include "gdk/gdk.h"
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
//-----------------------------------------------------------------------------
// wxCursor
//-----------------------------------------------------------------------------
@@ -137,38 +144,31 @@ GdkCursor *wxCursor::GetCursor() const
// busy cursor routines
//-----------------------------------------------------------------------------
extern wxCursor *g_globalCursor;
extern wxCursor g_globalCursor;
static wxCursor *gs_savedCursor = NULL;
static wxCursor gs_savedCursor;
static int gs_busyCount = 0;
void wxEndBusyCursor()
{
if ( --gs_busyCount > 0 )
if (--gs_busyCount > 0)
return;
wxCHECK_RET( gs_savedCursor && gs_savedCursor->Ok(),
_T("calling wxEndBusyCursor() without wxBeginBusyCursor()?") );
wxSetCursor(*gs_savedCursor);
delete gs_savedCursor;
gs_savedCursor = NULL;
wxSetCursor( gs_savedCursor );
gs_savedCursor = wxNullCursor;
}
void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
{
if ( gs_busyCount++ > 0 )
if (gs_busyCount++ > 0)
return;
wxASSERT_MSG( !gs_savedCursor,
wxASSERT_MSG( !gs_savedCursor.Ok(),
_T("forgot to call wxEndBusyCursor, will leak memory") );
gs_savedCursor = new wxCursor;
if ( g_globalCursor && g_globalCursor->Ok() )
*gs_savedCursor = *g_globalCursor;
else
*gs_savedCursor = wxCursor(wxCURSOR_ARROW);
wxSetCursor(wxCursor(wxCURSOR_WATCH));
gs_savedCursor = g_globalCursor;
wxSetCursor( wxCursor(wxCURSOR_WATCH) );
}
bool wxIsBusy()
@@ -178,5 +178,8 @@ bool wxIsBusy()
void wxSetCursor( const wxCursor& cursor )
{
if (g_globalCursor) (*g_globalCursor) = cursor;
if (g_isIdle)
wxapp_install_idle_handler();
g_globalCursor = cursor;
}