/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.cpp
+// Name: src/motif/cursor.cpp
// 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
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "cursor.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/app.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/window.h"
+ #include "wx/image.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{
- friend class WXDLLEXPORT wxCursor;
+ friend class wxCursor;
public:
wxCursorRefData();
- ~wxCursorRefData();
-
+ virtual ~wxCursorRefData();
+
wxXCursorList m_cursors; // wxXCursor objects, one per display
- wxStockCursor m_cursorId; // wxWindows standard cursor id
+ wxStockCursor m_cursorId; // wxWidgets standard cursor id
};
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
wxCursorRefData::~wxCursorRefData()
{
- wxXCursorList::Node* node = m_cursors.GetFirst();
+ wxXCursorList::compatibility_iterator node = m_cursors.GetFirst();
while (node)
{
wxXCursor* c = node->GetData();
unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount];
- int i, j, i8; unsigned char c, cMask;
+ int i, j, i8;
+ unsigned char c, cMask;
for (i=0; i<imagebitcount; i++)
{
bits[i] = 0xff;
for (j=0; j<8; j++)
{
// possible overflow if we do the summation first ?
- c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
- //if average value is > mid grey
+ c = (unsigned char)(rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3);
+ // if average value is > mid grey
if (c>127)
bits[i] = bits[i] & cMask;
- cMask = (cMask << 1) | 1;
+ cMask = (unsigned char)((cMask << 1) | 1);
}
}
{
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask;
- cMask = (cMask << 1);
+ cMask = (unsigned char)(cMask << 1);
}
}
}
int hotSpotX;
int hotSpotY;
- if (image.HasOption(wxCUR_HOTSPOT_X))
- hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
+ if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+ hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
else
hotSpotX = 0;
- if (image.HasOption(wxCUR_HOTSPOT_Y))
- hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+ if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+ hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
else
hotSpotY = 0;
(Pixmap)mask_pixmap,
&foreground_color,
&background_color,
- hotSpotX ,
+ hotSpotX ,
hotSpotY);
if (cursor)
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)
{
}
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
{
return m_refData != NULL;
}
// Motif-specific: create/get a cursor for the current display
-WXCursor wxCursor::GetXCursor(WXDisplay* display)
+WXCursor wxCursor::GetXCursor(WXDisplay* display) const
{
if (!M_CURSORDATA)
return (WXCursor) 0;
- wxXCursorList::Node* node = M_CURSORDATA->m_cursors.GetFirst();
+ wxXCursorList::compatibility_iterator node = M_CURSORDATA->m_cursors.GetFirst();
while (node)
{
wxXCursor* c = node->GetData();
}
// Make a cursor from standard id
-WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
+WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) const
{
Display* dpy = (Display*) display;
Cursor cursor = (Cursor) 0;
switch (id)
{
+ case wxCURSOR_CHAR: return (WXCursor)cursor;
+
case wxCURSOR_WAIT: x_cur = XC_watch; break;
- case wxCURSOR_CROSS: x_cur = XC_crosshair; break;
- case wxCURSOR_CHAR: return (WXCursor)cursor; break;
+ case wxCURSOR_CROSS: x_cur = XC_crosshair; break;
case wxCURSOR_HAND: x_cur = XC_hand1; break;
case wxCURSOR_BULLSEYE: x_cur = XC_target; break;
- case wxCURSOR_PENCIL: x_cur = XC_pencil; break;
- case wxCURSOR_MAGNIFIER: x_cur = XC_sizing; break;
- case wxCURSOR_IBEAM: x_cur = XC_xterm; break;
+ case wxCURSOR_PENCIL: x_cur = XC_pencil; break;
+ case wxCURSOR_MAGNIFIER: x_cur = XC_sizing; break;
+ case wxCURSOR_IBEAM: x_cur = XC_xterm; break;
case wxCURSOR_NO_ENTRY: x_cur = XC_pirate; break;
- case wxCURSOR_LEFT_BUTTON: x_cur = XC_leftbutton; break;
- case wxCURSOR_RIGHT_BUTTON: x_cur = XC_rightbutton; break;
+ case wxCURSOR_LEFT_BUTTON: x_cur = XC_leftbutton; break;
+ case wxCURSOR_RIGHT_BUTTON: x_cur = XC_rightbutton; break;
case wxCURSOR_MIDDLE_BUTTON: x_cur = XC_middlebutton; break;
case wxCURSOR_QUESTION_ARROW: x_cur = XC_question_arrow; break;
case wxCURSOR_SIZING: x_cur = XC_sizing; break;
// Helper function
static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)
{
Display *display = (Display*) win->GetXDisplay();
XFlush (display);
- for(wxWindowList::Node *node = win->GetChildren().GetFirst (); node;
+ for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node;
node = node->GetNext())
{
wxWindow *child = node->GetData ();
}
// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
{
wxBusyCursorCount++;
if (wxBusyCursorCount == 1)
{
- for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+ for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
node = node->GetNext())
{
wxWindow *win = node->GetData ();
wxBusyCursorCount--;
if (wxBusyCursorCount == 0)
{
- for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+ for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
node = node->GetNext())
{
wxWindow *win = node->GetData ();
}
}
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
bool wxIsBusy()
{
return (wxBusyCursorCount > 0);
projects / wxWidgets.git / blobdiff