// Name: cursor.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/cursor.h"
+#include "gdk/gdk.h"
+
//-----------------------------------------------------------------------------
// wxCursor
//-----------------------------------------------------------------------------
class wxCursorRefData: public wxObjectRefData
{
public:
-
- wxCursorRefData(void);
- ~wxCursorRefData(void);
-
+
+ wxCursorRefData();
+ ~wxCursorRefData();
+
GdkCursor *m_cursor;
};
-wxCursorRefData::wxCursorRefData(void)
+wxCursorRefData::wxCursorRefData()
{
- m_cursor = (GdkCursor *) NULL;
+ m_cursor = (GdkCursor *) NULL;
}
-wxCursorRefData::~wxCursorRefData(void)
+wxCursorRefData::~wxCursorRefData()
{
- if (m_cursor) gdk_cursor_destroy( m_cursor );
+ if (m_cursor) gdk_cursor_destroy( m_cursor );
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
-wxCursor::wxCursor(void)
+wxCursor::wxCursor()
{
}
wxCursor::wxCursor( int cursorId )
{
- m_refData = new wxCursorRefData();
-
- GdkCursorType gdk_cur = GDK_LEFT_PTR;
- switch (cursorId)
- {
- case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
- case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
- case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
- case wxCURSOR_SIZENS: gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
- case wxCURSOR_WAIT: gdk_cur = GDK_WATCH; break;
- case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break;
- case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break;
- case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break;
- case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break;
- case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break;
- case wxCURSOR_NO_ENTRY: gdk_cur = GDK_PIRATE; break;
- }
-
- M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
-
+ m_refData = new wxCursorRefData();
+
+ GdkCursorType gdk_cur = GDK_LEFT_PTR;
+ switch (cursorId)
+ {
+ case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
+ case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
+ case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
+ case wxCURSOR_SIZENS: gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
+ case wxCURSOR_WAIT:
+ case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break;
+ case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break;
+ case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break;
+ case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break;
+ case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break;
+ case wxCURSOR_NO_ENTRY: gdk_cur = GDK_PIRATE; break;
+ case wxCURSOR_SIZENWSE:
+ case wxCURSOR_SIZENESW: gdk_cur = GDK_FLEUR; break;
+ case wxCURSOR_QUESTION_ARROW: gdk_cur = GDK_QUESTION_ARROW; break;
+ case wxCURSOR_PAINT_BRUSH: gdk_cur = GDK_SPRAYCAN; break;
+ case wxCURSOR_MAGNIFIER: gdk_cur = GDK_PLUS; break;
+ case wxCURSOR_CHAR: gdk_cur = GDK_XTERM; break;
+ case wxCURSOR_LEFT_BUTTON: gdk_cur = GDK_LEFTBUTTON; break;
+ case wxCURSOR_MIDDLE_BUTTON: gdk_cur = GDK_MIDDLEBUTTON; break;
+ case wxCURSOR_RIGHT_BUTTON: gdk_cur = GDK_RIGHTBUTTON; break;
/*
- do that yourself
-
- wxCURSOR_BULLSEYE,
- wxCURSOR_CHAR,
- wxCURSOR_LEFT_BUTTON,
- wxCURSOR_MAGNIFIER,
- wxCURSOR_MIDDLE_BUTTON,
- wxCURSOR_NO_ENTRY,
- wxCURSOR_PAINT_BRUSH,
- wxCURSOR_POINT_LEFT,
- wxCURSOR_POINT_RIGHT,
- wxCURSOR_QUESTION_ARROW,
- wxCURSOR_RIGHT_BUTTON,
- wxCURSOR_SIZENESW,
- wxCURSOR_SIZENS,
- wxCURSOR_SIZENWSE,
- wxCURSOR_SIZEWE,
- wxCURSOR_BLANK
-,
- wxCURSOR_CROSS_REVERSE,
- wxCURSOR_DOUBLE_ARROW,
- wxCURSOR_BASED_ARROW_UP,
- wxCURSOR_BASED_ARROW_DOWN
+ case wxCURSOR_DOUBLE_ARROW: gdk_cur = GDK_DOUBLE_ARROW; break;
+ case wxCURSOR_CROSS_REVERSE: gdk_cur = GDK_CROSS_REVERSE; break;
+ case wxCURSOR_BASED_ARROW_UP: gdk_cur = GDK_BASED_ARROW_UP; break;
+ case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
*/
-
-}
+ default:
+ wxFAIL_MSG(_T("unsupported cursor type"));
+ // will use the standard one
-wxCursor::wxCursor( const wxCursor &cursor )
-{
- Ref( cursor );
+ case wxCURSOR_ARROW:
+ break;
+ }
+
+ M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
}
-wxCursor::wxCursor( const wxCursor *cursor )
+wxCursor::wxCursor( const wxCursor &cursor )
{
- UnRef();
- if (cursor) Ref( *cursor );
+ Ref( cursor );
}
-wxCursor::~wxCursor(void)
+wxCursor::~wxCursor()
{
}
wxCursor& wxCursor::operator = ( const wxCursor& cursor )
{
- if (*this == cursor) return (*this);
- Ref( cursor );
- return *this;
+ if (*this == cursor)
+ return (*this);
+
+ Ref( cursor );
+
+ return *this;
}
-bool wxCursor::operator == ( const wxCursor& cursor )
+bool wxCursor::operator == ( const wxCursor& cursor ) const
{
- return m_refData == cursor.m_refData;
+ return m_refData == cursor.m_refData;
}
-bool wxCursor::operator != ( const wxCursor& cursor )
+bool wxCursor::operator != ( const wxCursor& cursor ) const
{
- return m_refData != cursor.m_refData;
+ return m_refData != cursor.m_refData;
}
-bool wxCursor::Ok(void) const
+bool wxCursor::Ok() const
{
- return (m_refData != NULL);
+ return (m_refData != NULL);
}
-GdkCursor *wxCursor::GetCursor(void) const
+GdkCursor *wxCursor::GetCursor() const
{
- return M_CURSORDATA->m_cursor;
+ return M_CURSORDATA->m_cursor;
}
//-----------------------------------------------------------------------------
// busy cursor routines
//-----------------------------------------------------------------------------
-bool g_isBusy = FALSE;
+extern wxCursor *g_globalCursor;
+
+static wxCursor *gs_savedCursor = NULL;
+static int gs_busyCount = 0;
-void wxEndBusyCursor(void)
+void wxEndBusyCursor()
{
- g_isBusy = FALSE;
+ 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;
}
void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
{
- g_isBusy = TRUE;
+ if ( gs_busyCount++ > 0 )
+ return;
+
+ wxASSERT_MSG( !gs_savedCursor,
+ _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));
}
-bool wxIsBusy(void)
+bool wxIsBusy()
{
- return g_isBusy;
+ return gs_busyCount > 0;
}
void wxSetCursor( const wxCursor& cursor )
{
- extern wxCursor *g_globalCursor;
- if (g_globalCursor) (*g_globalCursor) = cursor;
-
- if (cursor.Ok()) {}
+ if (g_globalCursor) (*g_globalCursor) = cursor;
}
-
-
projects / wxWidgets.git / blobdiff