X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffa3d6b8a38a13b84b727697b59cc8742174cdc0..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/cursor.cpp?ds=sidebyside

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 3c5f636840..66b2925bec 100644
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -9,10 +9,13 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "cursor.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/cursor.h"
 #include "wx/app.h"
 #include "wx/utils.h"
@@ -54,7 +57,7 @@ public:
     ~wxCursorRefData();
     
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
-    wxStockCursor m_cursorId; // wxWindows standard cursor id
+    wxStockCursor m_cursorId; // wxWidgets standard cursor id
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@ -69,7 +72,7 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::~wxCursorRefData()
 {
-    wxXCursorList::Node* node = m_cursors.GetFirst();
+    wxXCursorList::compatibility_iterator node = m_cursors.GetFirst();
     while (node)
     {
         wxXCursor* c = node->GetData();
@@ -143,13 +146,13 @@ wxCursor::wxCursor(const wxImage & image)
     int hotSpotX;
     int hotSpotY;
 
-    if (image.HasOption(wxCUR_HOTSPOT_X))
-        hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+        hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
     else
         hotSpotX = 0;
 
-    if (image.HasOption(wxCUR_HOTSPOT_Y))
-        hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+        hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
     else
         hotSpotY = 0;
 
@@ -295,11 +298,11 @@ bool wxCursor::Ok() const
 }
 
 // Motif-specific: create/get a cursor for the current display
-WXCursor wxCursor::GetXCursor(WXDisplay* display)
+WXCursor wxCursor::GetXCursor(WXDisplay* display) const
 {
     if (!M_CURSORDATA)
         return (WXCursor) 0;
-    wxXCursorList::Node* node = M_CURSORDATA->m_cursors.GetFirst();
+    wxXCursorList::compatibility_iterator node = M_CURSORDATA->m_cursors.GetFirst();
     while (node)
     {
         wxXCursor* c = node->GetData();
@@ -330,7 +333,7 @@ WXCursor wxCursor::GetXCursor(WXDisplay* display)
 }
 
 // Make a cursor from standard id
-WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
+WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) const
 {
     Display* dpy = (Display*) display;
     Cursor cursor = (Cursor) 0;
@@ -452,7 +455,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 
     XFlush (display);
 
-    for(wxWindowList::Node *node = win->GetChildren().GetFirst (); node; 
+    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node; 
         node = node->GetNext())
     {
         wxWindow *child = node->GetData ();
@@ -466,7 +469,7 @@ void wxBeginBusyCursor(wxCursor *cursor)
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)
     {
-        for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+        for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
             node = node->GetNext())
         {
             wxWindow *win = node->GetData ();
@@ -484,7 +487,7 @@ void wxEndBusyCursor()
     wxBusyCursorCount--;
     if (wxBusyCursorCount == 0)
     {
-        for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+        for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
             node = node->GetNext())
         {
             wxWindow *win = node->GetData ();
@@ -493,7 +496,7 @@ void wxEndBusyCursor()
     }
 }
 
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
 bool wxIsBusy()
 {
     return (wxBusyCursorCount > 0);