removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 3db0a16fe7d70ed29c10c2b44a0e6de4a44ed74d..2ef7e2dbdae880ab65a1f2c17222df94f5a22fb1 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -1,76 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/motif/cursor.h

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
+#include "wx/object.h"
+#include "wx/gdicmn.h"

 
 

-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData();
-    ~wxCursorRefData();
-
-protected:
-/* TODO: implementation
-  WXHCURSOR m_hCursor;
-*/
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+class WXDLLEXPORT wxImage;

 
 // Cursor
 
 // Cursor

-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLEXPORT wxCursor: public wxObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 
 public:
 
 public:

-  wxCursor();
+    wxCursor();

 
 

-  // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
-  inline wxCursor(const wxCursor* cursor) { if (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);
+
+#if wxUSE_IMAGE
+    wxCursor(const wxImage& image);
+#endif

 
 

-  /* TODO: make default type suit platform */
-  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
+    wxCursor(wxStockCursor id);
+    ~wxCursor();

 
 

-  wxCursor(int cursor_type);
-  ~wxCursor();
+    virtual bool Ok() const;

 
 

-  // TODO: also verify the internal cursor handle
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    bool operator == (const wxCursor& cursor) const
+        { return m_refData == cursor.m_refData; }
+    bool operator != (const wxCursor& cursor) const
+        { return m_refData != cursor.m_refData; }

 
 

-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-  inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
+    // Motif-specific.
+    // Create/get a cursor for the current display
+    WXCursor GetXCursor(WXDisplay* display) const;
+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);

 
 

-/* TODO: implementation
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-*/
+    // Make a cursor from standard id
+    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;

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

-    // _WX_CURSOR_H_
+// _WX_CURSOR_H_