X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..e487524e492809638b7e335937c41fd432458a54:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index bb0888bdcb..01a469f84f 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -2,9 +2,8 @@ // Name: cursor.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,13 +30,13 @@ class wxCursorRefData: public wxObjectRefData wxCursorRefData::wxCursorRefData(void) { - m_cursor = NULL; -}; + m_cursor = (GdkCursor *) NULL; +} wxCursorRefData::~wxCursorRefData(void) { if (m_cursor) gdk_cursor_destroy( m_cursor ); -}; +} //----------------------------------------------------------------------------- @@ -47,9 +46,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor(void) { -}; +} -wxCursor::wxCursor( const int cursorId ) +wxCursor::wxCursor( int cursorId ) { m_refData = new wxCursorRefData(); @@ -67,7 +66,7 @@ wxCursor::wxCursor( const int cursorId ) 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 ); @@ -97,49 +96,49 @@ wxCursor::wxCursor( const int cursorId ) wxCURSOR_BASED_ARROW_DOWN */ -}; +} wxCursor::wxCursor( const wxCursor &cursor ) { Ref( cursor ); -}; +} wxCursor::wxCursor( const wxCursor *cursor ) { UnRef(); if (cursor) Ref( *cursor ); -}; +} wxCursor::~wxCursor(void) { -}; +} wxCursor& wxCursor::operator = ( const wxCursor& cursor ) { if (*this == cursor) return (*this); Ref( cursor ); return *this; -}; +} bool wxCursor::operator == ( const wxCursor& cursor ) { return m_refData == cursor.m_refData; -}; +} bool wxCursor::operator != ( const wxCursor& cursor ) { return m_refData != cursor.m_refData; -}; +} bool wxCursor::Ok(void) const { - return TRUE; -}; + return (m_refData != NULL); +} GdkCursor *wxCursor::GetCursor(void) const { return M_CURSORDATA->m_cursor; -}; +} //----------------------------------------------------------------------------- // busy cursor routines @@ -150,24 +149,24 @@ bool g_isBusy = FALSE; void wxEndBusyCursor(void) { g_isBusy = FALSE; -}; +} void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) { g_isBusy = TRUE; -}; +} bool wxIsBusy(void) { return g_isBusy; -}; +} void wxSetCursor( const wxCursor& cursor ) { extern wxCursor *g_globalCursor; if (g_globalCursor) (*g_globalCursor) = cursor; - if (cursor.Ok()) {}; -}; + if (cursor.Ok()) {} +}