/////////////////////////////////////////////////////////////////////////////
-// 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/gdicmn.h"
-#include "wx/icon.h"
-#include "wx/app.h"
-#include "wx/utils.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"
+ #include "wx/log.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#include "wx/motif/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
+// Cursor for one display, so we can choose the correct one for
+// the current display.
+class wxXCursor
+{
+public:
+ WXDisplay* m_display;
+ WXCursor m_cursor;
+};
+
+WX_DECLARE_LIST(wxXCursor, wxXCursorList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxXCursorList)
+
+class WXDLLEXPORT wxCursorRefData: public wxGDIRefData
+{
+public:
+ wxCursorRefData();
+ virtual ~wxCursorRefData();
+
+ wxXCursorList m_cursors; // wxXCursor objects, one per display
+ wxStockCursor m_cursorId; // wxWidgets standard cursor id
+
+private:
+ // There is no way to copy m_cursor so we can't implement a copy ctor
+ // properly.
+ wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
+
+ friend class wxCursor;
+};
+
+#define M_CURSORDATA ((wxCursorRefData *)m_refData)
+#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
wxCursorRefData::wxCursorRefData()
{
- m_width = 32; m_height = 32;
m_cursorId = wxCURSOR_NONE;
}
wxCursorRefData::~wxCursorRefData()
{
- wxList::Node* node = m_cursors.GetFirst();
+ wxXCursorList::compatibility_iterator node = m_cursors.GetFirst();
while (node)
{
- wxXCursor* c = (wxXCursor*) node->GetData();
- // TODO: how to delete cursor?
- // XDestroyCursor((Display*) c->m_display, (Cursor) c->m_cursor); // ??
+ wxXCursor* c = node->GetData();
+ XFreeCursor((Display*) c->m_display, (Cursor) c->m_cursor);
delete c;
node = node->GetNext();
}
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] = 0;
+ bits[i] = 0xff;
i8 = i * 8;
- cMask = 1;
+ cMask = 0xfe; // 11111110
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 * 2;
+ bits[i] = bits[i] & cMask;
+ cMask = (unsigned char)((cMask << 1) | 1);
}
}
- unsigned long keyMaskColor;
if (bHasMask)
{
unsigned char
maskBits[i] = 0x0;
i8 = i * 8;
- cMask = 1;
+ cMask = 0x1;
for (j=0; j<8; j++)
{
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 * 2;
+ cMask = (unsigned char)(cMask << 1);
}
}
-
- keyMaskColor = (r << 16) | (g << 8) | b;
}
else // no mask
{
for (i=0; i<imagebitcount; i++)
maskBits[i] = 0xFF;
-
- // init it to avoid compiler warnings
- keyMaskColor = 0;
- }
-/*
- // find the most frequent color(s)
- wxImageHistogram histogram;
- image.ComputeHistogram(histogram);
-
- // colors as rrggbb
- unsigned long key;
- unsigned long value;
-
- long colMostFreq = 0;
- unsigned long nMost = 0;
- long colNextMostFreq = 0;
- unsigned long nNext = 0;
- for ( wxImageHistogram::iterator entry = histogram.begin();
- entry != histogram.end();
- ++entry )
- {
- value = entry->second.value;
- key = entry->first;
- if ( !bHasMask || (key != keyMaskColor) )
- {
- if (value > nMost)
- {
- nMost = value;
- colMostFreq = key;
- }
- else if (value > nNext)
- {
- nNext = value;
- colNextMostFreq = key;
- }
- }
}
- wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
- (unsigned char)(colMostFreq >> 8),
- (unsigned char)(colMostFreq) );
-
- wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
- (unsigned char)(colNextMostFreq >> 8),
- (unsigned char)(colNextMostFreq) );
-end of color code
- */
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;
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
hotSpotY = 0;
-
- m_refData = new wxCursorRefData;
+
+ Create( (const char*)bits, w, h, hotSpotX, hotSpotY,
+ (const char*)maskBits );
+
+ delete[] bits;
+ delete[] maskBits;
+}
+#endif
+
+void wxCursor::Create(const char bits[], int width, int height,
+ int hotSpotX, int hotSpotY, const char maskBits[])
+{
+ if( !m_refData )
+ m_refData = new wxCursorRefData;
Display *dpy = (Display*) wxGetDisplay();
int screen_num = DefaultScreen (dpy);
Pixmap pixmap = XCreatePixmapFromBitmapData (dpy,
- RootWindow (dpy, DefaultScreen(dpy)),
- (char*) bits, w, h,
+ RootWindow (dpy, screen_num),
+ (char*) bits, width, height,
1 , 0 , 1);
Pixmap mask_pixmap = None;
if (maskBits != NULL)
{
mask_pixmap = XCreatePixmapFromBitmapData (dpy,
- RootWindow (dpy, DefaultScreen(dpy)),
- (char*) maskBits, w, h,
+ RootWindow (dpy, screen_num),
+ (char*) maskBits, width, height,
1 , 0 , 1);
}
- XColor foreground_color;
- XColor background_color;
- foreground_color.pixel = BlackPixel(dpy, screen_num);
- background_color.pixel = WhitePixel(dpy, screen_num);
- Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
- XQueryColor(dpy, cmap, &foreground_color);
- XQueryColor(dpy, cmap, &background_color);
-
- Cursor cursor = XCreatePixmapCursor (dpy,
- pixmap,
- mask_pixmap,
- &foreground_color,
- &background_color,
- hotSpotX ,
- hotSpotY);
+ Create( (WXPixmap)pixmap, (WXPixmap)mask_pixmap, hotSpotX, hotSpotY );
XFreePixmap( dpy, pixmap );
if (mask_pixmap != None)
{
XFreePixmap( dpy, mask_pixmap );
}
-
- if (cursor)
- {
- wxXCursor *c = new wxXCursor;
-
- c->m_cursor = (WXCursor) cursor;
- c->m_display = (WXDisplay*) dpy;
- M_CURSORDATA->m_cursors.Append(c);
- M_CURSORDATA->m_ok = TRUE;
- }
- else
- {
- M_CURSORDATA->m_ok = TRUE;
- }
-
}
-#endif
-wxCursor::wxCursor(const char bits[], int width, int height,
- int hotSpotX, int hotSpotY, const char maskBits[])
+void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
+ int hotSpotX, int hotSpotY)
{
- m_refData = new wxCursorRefData;
+ if( !m_refData )
+ m_refData = new wxCursorRefData;
Display *dpy = (Display*) wxGetDisplay();
int screen_num = DefaultScreen (dpy);
- Pixmap pixmap = XCreatePixmapFromBitmapData (dpy,
- RootWindow (dpy, DefaultScreen(dpy)),
- (char*) bits, width, height,
- 1 , 0 , 1);
-
- Pixmap mask_pixmap = None;
- if (maskBits != NULL)
- {
- mask_pixmap = XCreatePixmapFromBitmapData (dpy,
- RootWindow (dpy, DefaultScreen(dpy)),
- (char*) maskBits, width, height,
- 1 , 0 , 1);
- }
-
XColor foreground_color;
XColor background_color;
foreground_color.pixel = BlackPixel(dpy, screen_num);
XQueryColor(dpy, cmap, &background_color);
Cursor cursor = XCreatePixmapCursor (dpy,
- pixmap,
- mask_pixmap,
+ (Pixmap)pixmap,
+ (Pixmap)mask_pixmap,
&foreground_color,
&background_color,
- hotSpotX ,
+ hotSpotX ,
hotSpotY);
- XFreePixmap( dpy, pixmap );
- if (mask_pixmap != None)
- {
- XFreePixmap( dpy, mask_pixmap );
- }
-
if (cursor)
{
wxXCursor *c = new wxXCursor;
c->m_cursor = (WXCursor) cursor;
c->m_display = (WXDisplay*) dpy;
M_CURSORDATA->m_cursors.Append(c);
- M_CURSORDATA->m_ok = TRUE;
- }
- else
- {
- M_CURSORDATA->m_ok = TRUE;
}
}
-wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor(const char bits[], int width, int height,
+ int hotSpotX, int hotSpotY, const char maskBits[] ,
+ const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg) )
+{
+ Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
+}
+
+wxCursor::wxCursor(const wxString& name, wxBitmapType type,
+ int hotSpotX, int hotSpotY)
{
// Must be an XBM file
- if (flags != wxBITMAP_TYPE_XBM)
+ if (type != wxBITMAP_TYPE_XBM) {
+ wxLogError("Invalid cursor bitmap type '%d'", type);
return;
+ }
m_refData = new wxCursorRefData;
int hotX = -1, hotY = -1;
unsigned int w, h;
- Pixmap pixmap;
+ Pixmap pixmap = None, mask_pixmap = None;
Display *dpy = (Display*) wxGetDisplay();
int screen_num = DefaultScreen (dpy);
- int value = XReadBitmapFile (dpy, RootWindow (dpy, DefaultScreen (dpy)),
- (char*) (const char*) name, &w, &h, &pixmap, &hotX, &hotY);
-
- M_BITMAPDATA->m_width = w;
- M_BITMAPDATA->m_height = h;
- M_BITMAPDATA->m_depth = 1;
+ int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
+ name.mb_str(),
+ &w, &h, &pixmap, &hotX, &hotY);
- if ((value == BitmapFileInvalid) ||
- (value == BitmapOpenFailed) ||
- (value == BitmapNoMemory))
- {
- }
- else
+ if (value == BitmapSuccess)
{
- XColor foreground_color;
- XColor background_color;
- foreground_color.pixel = BlackPixel(dpy, screen_num);
- background_color.pixel = WhitePixel(dpy, screen_num);
- Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
- XQueryColor(dpy, cmap, &foreground_color);
- XQueryColor(dpy, cmap, &background_color);
-
// TODO: how do we determine whether hotX, hotY were read correctly?
if (hotX < 0 || hotY < 0)
{
hotY = 0;
}
- Pixmap mask_pixmap = None;
- Cursor cursor = XCreatePixmapCursor (dpy,
- pixmap,
- mask_pixmap,
- &foreground_color,
- &background_color,
- hotX,
- hotY);
+ Create( (WXPixmap)pixmap, (WXPixmap)mask_pixmap, hotX, hotY );
XFreePixmap( dpy, pixmap );
- if (cursor)
- {
- wxXCursor *c = new wxXCursor;
-
- c->m_cursor = (WXCursor) cursor;
- c->m_display = (WXDisplay*) dpy;
- M_CURSORDATA->m_cursors.Append(c);
- M_CURSORDATA->m_ok = TRUE;
- }
}
-
}
// Cursors by stock number
-wxCursor::wxCursor(wxStockCursor id)
+void wxCursor::InitFromStock(wxStockCursor id)
{
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursorId = id;
- M_CURSORDATA->m_ok = TRUE;
+}
- WXDisplay* display = wxGetDisplay();
- if (!display)
- return;
+wxCursor::~wxCursor()
+{
+}
- WXCursor cursor = GetXCursor(display);
- if (cursor)
- {
- wxXCursor* c = new wxXCursor;
- c->m_cursor = cursor;
- c->m_display = wxGetDisplay();
- M_CURSORDATA->m_cursors.Append(c);
- M_CURSORDATA->m_ok = TRUE;
- }
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+ return new wxCursorRefData;
}
-wxCursor::~wxCursor()
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
+ wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxMotif.") );
+
+ return new wxCursorRefData;
}
// 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;
- wxList::Node* node = M_CURSORDATA->m_cursors.GetFirst();
+ wxXCursorList::compatibility_iterator node = M_CURSORDATA->m_cursors.GetFirst();
while (node)
{
- wxXCursor* c = (wxXCursor*) node->GetData();
+ wxXCursor* c = node->GetData();
if (c->m_display == display)
return c->m_cursor;
node = node->GetNext();
}
// 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;
+ int x_cur = -1;
switch (id)
{
- case wxCURSOR_WAIT:
- {
- cursor = XCreateFontCursor (dpy, XC_watch);
- break;
- }
- case wxCURSOR_CROSS:
- {
- cursor = XCreateFontCursor (dpy, XC_crosshair);
- break;
- }
- case wxCURSOR_CHAR:
- {
- // Nothing
- break;
- }
- case wxCURSOR_HAND:
- {
- cursor = XCreateFontCursor (dpy, XC_hand1);
- break;
- }
- case wxCURSOR_BULLSEYE:
- {
- cursor = XCreateFontCursor (dpy, XC_target);
- break;
- }
- case wxCURSOR_PENCIL:
- {
- cursor = XCreateFontCursor (dpy, XC_pencil);
- break;
- }
- case wxCURSOR_MAGNIFIER:
- {
- cursor = XCreateFontCursor (dpy, XC_sizing);
- break;
- }
- case wxCURSOR_IBEAM:
- {
- cursor = XCreateFontCursor (dpy, XC_xterm);
- break;
- }
- case wxCURSOR_NO_ENTRY:
- {
- cursor = XCreateFontCursor (dpy, XC_pirate);
- break;
- }
- case wxCURSOR_LEFT_BUTTON:
- {
- cursor = XCreateFontCursor (dpy, XC_leftbutton);
- break;
- }
- case wxCURSOR_RIGHT_BUTTON:
- {
- cursor = XCreateFontCursor (dpy, XC_rightbutton);
- break;
- }
- case wxCURSOR_MIDDLE_BUTTON:
- {
- cursor = XCreateFontCursor (dpy, XC_middlebutton);
- break;
- }
- case wxCURSOR_QUESTION_ARROW:
- {
- cursor = XCreateFontCursor (dpy, XC_question_arrow);
- break;
- }
- case wxCURSOR_SIZING:
- {
- cursor = XCreateFontCursor (dpy, XC_sizing);
- break;
- }
- case wxCURSOR_WATCH:
- {
- cursor = XCreateFontCursor (dpy, XC_watch);
- break;
- }
- case wxCURSOR_SPRAYCAN:
- {
- cursor = XCreateFontCursor (dpy, XC_spraycan);
- break;
- }
- case wxCURSOR_PAINT_BRUSH:
- {
- cursor = XCreateFontCursor (dpy, XC_spraycan);
- break;
- }
- case wxCURSOR_SIZENWSE:
- case wxCURSOR_SIZENESW:
- {
- // Not available in X
- cursor = XCreateFontCursor (dpy, XC_crosshair);
- break;
- }
- case wxCURSOR_SIZEWE:
- {
- cursor = XCreateFontCursor (dpy, XC_sb_h_double_arrow);
- break;
- }
- case wxCURSOR_SIZENS:
- {
- cursor = XCreateFontCursor (dpy, XC_sb_v_double_arrow);
- break;
- }
- case wxCURSOR_POINT_LEFT:
- {
- cursor = XCreateFontCursor (dpy, XC_sb_left_arrow);
- break;
- }
- case wxCURSOR_POINT_RIGHT:
- {
- cursor = XCreateFontCursor (dpy, XC_sb_right_arrow);
- break;
- }
+ case wxCURSOR_CHAR: return (WXCursor)cursor;
+
+ case wxCURSOR_WAIT: x_cur = XC_watch; 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_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_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;
+ case wxCURSOR_WATCH: x_cur = XC_watch; break;
+ case wxCURSOR_SPRAYCAN: x_cur = XC_spraycan; break;
+ case wxCURSOR_PAINT_BRUSH: x_cur = XC_spraycan; break;
+ case wxCURSOR_SIZENWSE:
+ case wxCURSOR_SIZENESW: x_cur = XC_crosshair; break;
+ case wxCURSOR_SIZEWE: x_cur = XC_sb_h_double_arrow; break;
+ case wxCURSOR_SIZENS: x_cur = XC_sb_v_double_arrow; break;
+ case wxCURSOR_POINT_LEFT: x_cur = XC_sb_left_arrow; break;
+ case wxCURSOR_POINT_RIGHT: x_cur = XC_sb_right_arrow; break;
// (JD Huggins) added more stock cursors for X
// X-only cursors BEGIN
- case wxCURSOR_CROSS_REVERSE:
- {
- cursor = XCreateFontCursor(dpy, XC_cross_reverse);
- break;
- }
- case wxCURSOR_DOUBLE_ARROW:
- {
- cursor = XCreateFontCursor(dpy, XC_double_arrow);
- break;
- }
- case wxCURSOR_BASED_ARROW_UP:
- {
- cursor = XCreateFontCursor(dpy, XC_based_arrow_up);
- break;
- }
- case wxCURSOR_BASED_ARROW_DOWN:
- {
- cursor = XCreateFontCursor(dpy, XC_based_arrow_down);
- break;
- }
- default:
- case wxCURSOR_ARROW:
- {
- cursor = XCreateFontCursor (dpy, XC_top_left_arrow);
- break;
- }
- case wxCURSOR_BLANK:
- {
- GC gc;
- XGCValues gcv;
- Pixmap empty_pixmap;
- XColor blank_color;
-
- empty_pixmap = XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
- 16, 16, 1);
- gcv.function = GXxor;
- gc = XCreateGC (dpy,
- empty_pixmap,
- GCFunction,
- &gcv);
- XCopyArea (dpy,
+ case wxCURSOR_CROSS_REVERSE: x_cur = XC_cross_reverse; break;
+ case wxCURSOR_DOUBLE_ARROW: x_cur = XC_double_arrow; break;
+ case wxCURSOR_BASED_ARROW_UP: x_cur = XC_based_arrow_up; break;
+ case wxCURSOR_BASED_ARROW_DOWN: x_cur = XC_based_arrow_down; break;
+ case wxCURSOR_BLANK:
+ {
+ GC gc;
+ XGCValues gcv;
+ Pixmap empty_pixmap;
+ XColor blank_color;
+
+ empty_pixmap =
+ XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
+ 16, 16, 1);
+ gcv.function = GXxor;
+ gc = XCreateGC (dpy,
+ empty_pixmap,
+ GCFunction,
+ &gcv);
+ XCopyArea (dpy,
empty_pixmap,
empty_pixmap,
gc,
0, 0,
16, 16,
0, 0);
- XFreeGC (dpy, gc);
- cursor = XCreatePixmapCursor (dpy,
- empty_pixmap,
- empty_pixmap,
- &blank_color,
- &blank_color,
- 8, 8);
-
- break;
- }
+ XFreeGC (dpy, gc);
+ cursor = XCreatePixmapCursor (dpy,
+ empty_pixmap,
+ empty_pixmap,
+ &blank_color,
+ &blank_color,
+ 8, 8);
+
+ break;
+ }
+ case wxCURSOR_ARROW:
+ default: x_cur = XC_top_left_arrow; break;
}
+
+ if( x_cur == -1 )
+ return (WXCursor)cursor;
+
+ cursor = XCreateFontCursor (dpy, x_cur);
return (WXCursor) cursor;
}
// Helper function
static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)
{
Display *display = (Display*) win->GetXDisplay();
else
{
// Restore old cursor
- if (win->GetCursor().Ok())
+ if (win->GetCursor().IsOk())
attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
else
attrs.cursor = None;
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