projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix for old SDKs (VC6...) which don't define HDM_SETBITMAPMARGIN/Header_S...
[wxWidgets.git]
/
src
/
motif
/
cursor.cpp
diff --git
a/src/motif/cursor.cpp
b/src/motif/cursor.cpp
index 6d32080afdce56ea35d041cf2f17f7ebf77d2b41..df2e6c14b9abaa8cb278e09209aab0fbf11187ac 100644
(file)
--- a/
src/motif/cursor.cpp
+++ b/
src/motif/cursor.cpp
@@
-49,15
+49,16
@@
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxXCursorList)
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxXCursorList)
-class WXDLLEXPORT wxCursorRefData: public wx
Object
RefData
+class WXDLLEXPORT wxCursorRefData: public wx
GDI
RefData
{
{
- friend class wxCursor;
public:
wxCursorRefData();
virtual ~wxCursorRefData();
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
public:
wxCursorRefData();
virtual ~wxCursorRefData();
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
+
+ friend class wxCursor;
};
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
};
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@
-238,16
+239,20
@@
void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
}
wxCursor::wxCursor(const char bits[], int width, int height,
}
wxCursor::wxCursor(const char bits[], int width, int height,
- int hotSpotX, int hotSpotY, const char maskBits[])
+ int hotSpotX, int hotSpotY, const char maskBits[] ,
+ const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg) )
{
Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
}
{
Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
}
-wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
+ int hotSpotY )
{
// Must be an XBM file
{
// Must be an XBM file
- if (flags != wxBITMAP_TYPE_XBM)
+ if (type != wxBITMAP_TYPE_XBM) {
+ wxLogError("Invalid cursor bitmap type '%d'", type);
return;
return;
+ }
m_refData = new wxCursorRefData;
m_refData = new wxCursorRefData;
@@
-283,7
+288,7
@@
wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
}
// Cursors by stock number
}
// Cursors by stock number
-
wxCursor::wxCursor
(wxStockCursor id)
+
void wxCursor::InitFromStock
(wxStockCursor id)
{
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursorId = id;
{
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursorId = id;
@@
-293,9
+298,14
@@
wxCursor::~wxCursor()
{
}
{
}
-bool wxCursor::IsOk() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+ return new wxCursorRefData;
+}
+
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
{
{
- return
m_refData != NULL
;
+ return
new wxCursorRefData(*static_cast<const wxCursorRefData *>(data))
;
}
// Motif-specific: create/get a cursor for the current display
}
// Motif-specific: create/get a cursor for the current display