Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index ccb7837598f5fb63d806befce4ec4f2a01b30f9e..6bdf99270f0ce23ba2729975652437974c6732d8 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -18,23 +18,29 @@
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor

-class WXDLLEXPORT wxCursor : public wxGDIObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject

 {
 public:
     wxCursor();
 
     wxCursor(const char bits[], int width, int height,
              int hotSpotX = -1, int hotSpotY = -1,
 {
 public:
     wxCursor();
 
     wxCursor(const char bits[], int width, int height,
              int hotSpotX = -1, int hotSpotY = -1,

-             const char maskBits[] = NULL);
+             const char maskBits[] = NULL,
+             const wxColour* fg = NULL, const wxColour* bg = NULL);

 
 

-    wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
-        int hotSpotX = 0, int hotSpotY = 0);
+    wxCursor(const wxString& name,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+             int hotSpotX = 0, int hotSpotY = 0);

 
 #if wxUSE_IMAGE
     wxCursor(const wxImage& image);
 #endif
 
 
 #if wxUSE_IMAGE
     wxCursor(const wxImage& image);
 #endif
 

-    wxCursor(wxStockCursor id);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+

     virtual ~wxCursor();
 
     // Motif-specific.
     virtual ~wxCursor();
 
     // Motif-specific.


@@ -46,6 +52,8 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:

+    void InitFromStock(wxStockCursor);
+

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


@@ -57,7 +65,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 

-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
+extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);

 
 #endif
 // _WX_CURSOR_H_
 
 #endif
 // _WX_CURSOR_H_