X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e933b5bc365e0907a4f0fd15b4c49e4c96c2b59f..4ca64d4137439844a5e6c95b4da16f32cf7840ab:/src/motif/cursor.cpp diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index deddb7a41c..6bfc0ab441 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -12,13 +12,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/list.h" +#endif + #include "wx/cursor.h" -#include "wx/app.h" -#include "wx/utils.h" -#include "wx/list.h" -#include "wx/window.h" -#if wxUSE_IMAGE -#include "wx/image.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/image.h" #endif #ifdef __VMS__ @@ -50,7 +54,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); wxXCursorList m_cursors; // wxXCursor objects, one per display wxStockCursor m_cursorId; // wxWidgets standard cursor id @@ -289,7 +293,7 @@ wxCursor::~wxCursor() { } -bool wxCursor::Ok() const +bool wxCursor::IsOk() const { return m_refData != NULL; } @@ -426,7 +430,7 @@ static int wxBusyCursorCount = 0; // Helper function static void -wxXSetBusyCursor (wxWindow * win, wxCursor * cursor) +wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor) { Display *display = (Display*) win->GetXDisplay(); @@ -462,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor) } // Set the cursor to the busy cursor for all windows -void wxBeginBusyCursor(wxCursor *cursor) +void wxBeginBusyCursor(const wxCursor *cursor) { wxBusyCursorCount++; if (wxBusyCursorCount == 1)