projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix DrawStatusField() to work correctly with wxSB_FLAT style.
[wxWidgets.git]
/
src
/
motif
/
cursor.cpp
diff --git
a/src/motif/cursor.cpp
b/src/motif/cursor.cpp
index deddb7a41c9f9edd67ba0a73ae56ffa3653ae51e..68f66e43e29e625cdc08b9cd0e7c90737a964d28 100644
(file)
--- a/
src/motif/cursor.cpp
+++ b/
src/motif/cursor.cpp
@@
-12,13
+12,18
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+ #include "wx/list.h"
+#endif
+
#include "wx/cursor.h"
#include "wx/cursor.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/window.h"
+ #include "wx/image.h"
+ #include "wx/log.h"
#endif
#ifdef __VMS__
#endif
#ifdef __VMS__
@@
-45,15
+50,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 WXDLLEXPORT wxCursor;
public:
wxCursorRefData();
public:
wxCursorRefData();
- ~wxCursorRefData();
+
virtual
~wxCursorRefData();
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
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)
@@
-234,16
+240,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;
@@
-255,7
+265,7
@@
wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
int screen_num = DefaultScreen (dpy);
int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
int screen_num = DefaultScreen (dpy);
int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
-
wxConstCast(name.c_str(), char
),
+
name.mb_str(
),
&w, &h, &pixmap, &hotX, &hotY);
if (value == BitmapSuccess)
&w, &h, &pixmap, &hotX, &hotY);
if (value == BitmapSuccess)
@@
-279,7
+289,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;
@@
-289,9
+299,14
@@
wxCursor::~wxCursor()
{
}
{
}
-bool wxCursor::Ok() 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
@@
-426,7
+441,7
@@
static int wxBusyCursorCount = 0;
// Helper function
static void
// Helper function
static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win,
const
wxCursor * cursor)
{
Display *display = (Display*) win->GetXDisplay();
{
Display *display = (Display*) win->GetXDisplay();
@@
-462,7
+477,7
@@
wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
}
// Set the cursor to the busy cursor for all windows
}
// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(
const
wxCursor *cursor)
{
wxBusyCursorCount++;
if (wxBusyCursorCount == 1)
{
wxBusyCursorCount++;
if (wxBusyCursorCount == 1)