added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 87a19dadc987d97b89d35fbb9b6bde74dccffd6b..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_
 

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

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


@@ -32,8 +32,9 @@ public:
     // Copy constructors
     wxCursor(const wxCursor& cursor) { Ref(cursor); }
     
     // Copy constructors
     wxCursor(const wxCursor& cursor) { Ref(cursor); }
     

-    wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-        const char maskBits[] = NULL);
+    wxCursor(const char bits[], int width, int height,
+             int hotSpotX = -1, int hotSpotY = -1,
+             const char maskBits[] = NULL);

     
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
         int hotSpotX = 0, int hotSpotY = 0);
     
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
         int hotSpotX = 0, int hotSpotY = 0);


@@ -56,10 +57,15 @@ 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:
 private:

+    void Create(const char bits[], int width, int height,
+                int hotSpotX = -1, int hotSpotY = -1,
+                const char maskBits[] = NULL);
+    void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
+

     // Make a cursor from standard id
     // 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);