Correct compilation conditions for wxURL::SetProxy.

[wxWidgets.git] / include / wx / motif / cursor.h

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index d5ccf28f7a9f4bfce715fc897825aff2d8478d5f..4c6d47a635522210ed52ba0a19df885294dc1661 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "cursor.h"
 #endif
 
 #pragma interface "cursor.h"
 #endif
 


@@ -57,7 +57,7 @@ public:
 
     // Motif-specific.
     // Create/get a cursor for the current display
 
     // Motif-specific.
     // Create/get a cursor for the current display

-    WXCursor GetXCursor(WXDisplay* display) ;
+    WXCursor GetXCursor(WXDisplay* display) const;

 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,
 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,


@@ -65,7 +65,7 @@ private:
     void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
 
     // Make a cursor from standard id
     void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
 
     // Make a cursor from standard id

-    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id);
+    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;

 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);