#include "wx/cursor.h"
#include "wx/utils.h"
+#include "wx/app.h"
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// idle system
case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
case wxCURSOR_SIZENS: gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
+ case wxCURSOR_ARROWWAIT:
case wxCURSOR_WAIT:
case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break;
case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break;
case wxCURSOR_RIGHT_BUTTON: gdk_cur = GDK_RIGHTBUTTON; break;
case wxCURSOR_BULLSEYE: gdk_cur = GDK_TARGET; break;
+ case wxCURSOR_POINT_LEFT: gdk_cur = GDK_SB_LEFT_ARROW; break;
+ case wxCURSOR_POINT_RIGHT: gdk_cur = GDK_SB_RIGHT_ARROW; break;
/*
case wxCURSOR_DOUBLE_ARROW: gdk_cur = GDK_DOUBLE_ARROW; break;
case wxCURSOR_CROSS_REVERSE: gdk_cur = GDK_CROSS_REVERSE; break;
case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
*/
default:
- wxFAIL_MSG(T("unsupported cursor type"));
+ wxFAIL_MSG(wxT("unsupported cursor type"));
// will use the standard one
case wxCURSOR_ARROW:
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
}
+extern GtkWidget *wxRootWindow;
+
+wxCursor::wxCursor(const char bits[], int width, int height,
+ int hotSpotX, int hotSpotY,
+ const char maskBits[], wxColour *fg, wxColour *bg)
+{
+ if (!maskBits)
+ maskBits = bits;
+ if (!fg)
+ fg = wxBLACK;
+ if (!bg)
+ bg = wxWHITE;
+ if (hotSpotX < 0 || hotSpotX >= width)
+ hotSpotX = 0;
+ if (hotSpotY < 0 || hotSpotY >= height)
+ hotSpotY = 0;
+
+ GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
+ GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height);
+
+ m_refData = new wxCursorRefData;
+ M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
+ data, mask, fg->GetColor(), bg->GetColor(),
+ hotSpotX, hotSpotY );
+
+ gdk_bitmap_unref( data );
+ gdk_bitmap_unref( mask );
+}
+
+
wxCursor::wxCursor( const wxCursor &cursor )
{
Ref( cursor );
static wxCursor gs_savedCursor;
static int gs_busyCount = 0;
+const wxCursor &wxBusyCursor::GetStoredCursor()
+{
+ return gs_savedCursor;
+}
+
+const wxCursor wxBusyCursor::GetBusyCursor()
+{
+ return wxCursor(wxCURSOR_WATCH);
+}
+
void wxEndBusyCursor()
{
if (--gs_busyCount > 0)
wxSetCursor( gs_savedCursor );
gs_savedCursor = wxNullCursor;
- wxYield();
+ if (wxTheApp)
+ wxTheApp->SendIdleEvents();
}
void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
return;
wxASSERT_MSG( !gs_savedCursor.Ok(),
- T("forgot to call wxEndBusyCursor, will leak memory") );
+ wxT("forgot to call wxEndBusyCursor, will leak memory") );
gs_savedCursor = g_globalCursor;
wxSetCursor( wxCursor(wxCURSOR_WATCH) );
- wxYield();
+ if (wxTheApp)
+ wxTheApp->SendIdleEvents();
}
bool wxIsBusy()