projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added cfdataref.h and cfref.h to CoreFoundation headers list.
[wxWidgets.git]
/
src
/
motif
/
cursor.cpp
diff --git
a/src/motif/cursor.cpp
b/src/motif/cursor.cpp
index fdcd08b8a260e483a82e85c6ee37393221b48398..6d32080afdce56ea35d041cf2f17f7ebf77d2b41 100644
(file)
--- a/
src/motif/cursor.cpp
+++ b/
src/motif/cursor.cpp
@@
-1,29
+1,29
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
// Purpose: wxCursor class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence:
wxWidget
s licence
+// Licence:
wxWindow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "cursor.h"
-#endif
-
// 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"
-#i
nclude "wx/utils.h"
-
#include "wx/list
.h"
-
#include "wx/window
.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
+
+#i
fndef 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
#ifdef __VMS__
#pragma message disable nosimpint
@@
-47,15
+47,15
@@
public:
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxXCursorList)
;
+WX_DEFINE_LIST(wxXCursorList)
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{
- friend class
WXDLLEXPORT
wxCursor;
+ friend class 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
};
@@
-98,7
+98,8
@@
wxCursor::wxCursor(const wxImage & image)
unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount];
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 (i=0; i<imagebitcount; i++)
{
bits[i] = 0xff;
@@
-108,11
+109,11
@@
wxCursor::wxCursor(const wxImage & image)
for (j=0; j<8; j++)
{
// possible overflow if we do the summation first ?
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;
if (c>127)
bits[i] = bits[i] & cMask;
- cMask = (
cMask << 1) | 1
;
+ cMask = (
unsigned char)((cMask << 1) | 1)
;
}
}
}
}
@@
-133,7
+134,7
@@
wxCursor::wxCursor(const wxImage & image)
{
if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
maskBits[i] = maskBits[i] | cMask;
{
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);
}
}
}
}
}
}
@@
-223,7
+224,7
@@
void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
(Pixmap)mask_pixmap,
&foreground_color,
&background_color,
(Pixmap)mask_pixmap,
&foreground_color,
&background_color,
- hotSpotX ,
+ hotSpotX ,
hotSpotY);
if (cursor)
hotSpotY);
if (cursor)
@@
-258,7
+259,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)
@@
-292,13
+293,13
@@
wxCursor::~wxCursor()
{
}
{
}
-bool wxCursor::Ok() const
+bool wxCursor::
Is
Ok() const
{
return m_refData != NULL;
}
// Motif-specific: create/get a cursor for the current display
{
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;
{
if (!M_CURSORDATA)
return (WXCursor) 0;
@@
-333,7
+334,7
@@
WXCursor wxCursor::GetXCursor(WXDisplay* display)
}
// Make a cursor from standard id
}
// 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;
{
Display* dpy = (Display*) display;
Cursor cursor = (Cursor) 0;
@@
-341,17
+342,18
@@
WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
switch (id)
{
switch (id)
{
+ case wxCURSOR_CHAR: return (WXCursor)cursor;
+
case wxCURSOR_WAIT: x_cur = XC_watch; break;
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_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_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;
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;
@@
-428,7
+430,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();
@@
-455,7
+457,7
@@
wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
XFlush (display);
XFlush (display);
- for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node;
+ for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node;
node = node->GetNext())
{
wxWindow *child = node->GetData ();
node = node->GetNext())
{
wxWindow *child = node->GetData ();
@@
-464,7
+466,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)
@@
-496,7
+498,7
@@
void wxEndBusyCursor()
}
}
}
}
-//
TRUE
if we're between the above two calls
+//
true
if we're between the above two calls
bool wxIsBusy()
{
return (wxBusyCursorCount > 0);
bool wxIsBusy()
{
return (wxBusyCursorCount > 0);