linking fixes

[wxWidgets.git] / src / gtk / cursor.cpp

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 2034a9076a61d32100dfdeca3caf6680cc97b60d..c419a36837e9c713cbb7f4bfbbc30d1c3862ddde 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -13,8 +13,18 @@
 #endif
 
 #include "wx/cursor.h"
 #endif
 
 #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
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // wxCursor
 
 //-----------------------------------------------------------------------------
 // wxCursor


@@ -32,12 +42,12 @@ class wxCursorRefData: public wxObjectRefData
 
 wxCursorRefData::wxCursorRefData()
 {
 
 wxCursorRefData::wxCursorRefData()
 {

-  m_cursor = (GdkCursor *) NULL;
+    m_cursor = (GdkCursor *) NULL;

 }
 
 wxCursorRefData::~wxCursorRefData()
 {
 }
 
 wxCursorRefData::~wxCursorRefData()
 {

-  if (m_cursor) gdk_cursor_destroy( m_cursor );
+    if (m_cursor) gdk_cursor_destroy( m_cursor );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -52,57 +62,87 @@ wxCursor::wxCursor()
 
 wxCursor::wxCursor( int cursorId )
 {
 
 wxCursor::wxCursor( int cursorId )
 {

-  m_refData = new wxCursorRefData();
-
-  GdkCursorType gdk_cur = GDK_LEFT_PTR;
-  switch (cursorId)
-  {
-    case wxCURSOR_HAND:       gdk_cur = GDK_HAND1; break;
-    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_WAIT:       gdk_cur = GDK_WATCH; break;
-    case wxCURSOR_WATCH:      gdk_cur = GDK_WATCH; break;
-    case wxCURSOR_SIZING:     gdk_cur = GDK_SIZING; break;
-    case wxCURSOR_SPRAYCAN:   gdk_cur = GDK_SPRAYCAN; break;
-    case wxCURSOR_IBEAM:      gdk_cur = GDK_XTERM; break;
-    case wxCURSOR_PENCIL:     gdk_cur = GDK_PENCIL; break;
-    case wxCURSOR_NO_ENTRY:   gdk_cur = GDK_PIRATE; break;
-  }
-
-  M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
-
+    m_refData = new wxCursorRefData();
+
+    GdkCursorType gdk_cur = GDK_LEFT_PTR;
+    switch (cursorId)
+    {
+        case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;
+        case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
+        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_SPRAYCAN:         gdk_cur = GDK_SPRAYCAN; break;
+        case wxCURSOR_IBEAM:            gdk_cur = GDK_XTERM; break;
+        case wxCURSOR_PENCIL:           gdk_cur = GDK_PENCIL; break;
+        case wxCURSOR_NO_ENTRY:         gdk_cur = GDK_PIRATE; break;
+        case wxCURSOR_SIZENWSE:
+        case wxCURSOR_SIZENESW:         gdk_cur = GDK_FLEUR; break;
+        case wxCURSOR_QUESTION_ARROW:   gdk_cur = GDK_QUESTION_ARROW; break;
+        case wxCURSOR_PAINT_BRUSH:      gdk_cur = GDK_SPRAYCAN; break;
+        case wxCURSOR_MAGNIFIER:        gdk_cur = GDK_PLUS; break;
+        case wxCURSOR_CHAR:             gdk_cur = GDK_XTERM; break;
+        case wxCURSOR_LEFT_BUTTON:      gdk_cur = GDK_LEFTBUTTON; break;
+        case wxCURSOR_MIDDLE_BUTTON:    gdk_cur = GDK_MIDDLEBUTTON; 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;

 /*
 /*

-  do that yourself
-
-  wxCURSOR_BULLSEYE,
-  wxCURSOR_CHAR,
-  wxCURSOR_LEFT_BUTTON,
-  wxCURSOR_MAGNIFIER,
-  wxCURSOR_MIDDLE_BUTTON,
-  wxCURSOR_NO_ENTRY,
-  wxCURSOR_PAINT_BRUSH,
-  wxCURSOR_POINT_LEFT,
-  wxCURSOR_POINT_RIGHT,
-  wxCURSOR_QUESTION_ARROW,
-  wxCURSOR_RIGHT_BUTTON,
-  wxCURSOR_SIZENESW,
-  wxCURSOR_SIZENS,
-  wxCURSOR_SIZENWSE,
-  wxCURSOR_SIZEWE,
-  wxCURSOR_BLANK
-,
-  wxCURSOR_CROSS_REVERSE,
-  wxCURSOR_DOUBLE_ARROW,
-  wxCURSOR_BASED_ARROW_UP,
-  wxCURSOR_BASED_ARROW_DOWN
+        case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
+        case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;
+        case wxCURSOR_BASED_ARROW_UP:   gdk_cur = GDK_BASED_ARROW_UP; break;
+        case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;

 */
 */

+        default:
+            wxFAIL_MSG(wxT("unsupported cursor type"));
+            // will use the standard one
+
+        case wxCURSOR_ARROW:
+            break;
+    }

 
 

+    M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );

 }
 
 }
 

+extern GtkWidget *wxGetRootWindow();
+
+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( wxGetRootWindow()->window, (gchar *) bits, width, height );
+    GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->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 )
 {
 wxCursor::wxCursor( const wxCursor &cursor )
 {

-  Ref( cursor );
+    Ref( cursor );

 }
 
 wxCursor::~wxCursor()
 }
 
 wxCursor::~wxCursor()


@@ -111,58 +151,90 @@ wxCursor::~wxCursor()
 
 wxCursor& wxCursor::operator = ( const wxCursor& cursor )
 {
 
 wxCursor& wxCursor::operator = ( const wxCursor& cursor )
 {

-  if (*this == cursor) return (*this);
-  Ref( cursor );
-  return *this;
+    if (*this == cursor)
+        return (*this);
+
+    Ref( cursor );
+
+    return *this;

 }
 
 bool wxCursor::operator == ( const wxCursor& cursor ) const
 {
 }
 
 bool wxCursor::operator == ( const wxCursor& cursor ) const
 {

-  return m_refData == cursor.m_refData;
+    return m_refData == cursor.m_refData;

 }
 
 bool wxCursor::operator != ( const wxCursor& cursor ) const
 {
 }
 
 bool wxCursor::operator != ( const wxCursor& cursor ) const
 {

-  return m_refData != cursor.m_refData;
+    return m_refData != cursor.m_refData;

 }
 
 bool wxCursor::Ok() const
 {
 }
 
 bool wxCursor::Ok() const
 {

-  return (m_refData != NULL);
+    return (m_refData != NULL);

 }
 
 GdkCursor *wxCursor::GetCursor() const
 {
 }
 
 GdkCursor *wxCursor::GetCursor() const
 {

-  return M_CURSORDATA->m_cursor;
+    return M_CURSORDATA->m_cursor;

 }
 
 //-----------------------------------------------------------------------------
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // busy cursor routines
 //-----------------------------------------------------------------------------
 

-bool g_isBusy = FALSE;
+extern wxCursor g_globalCursor;
+
+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()
 {
 
 void wxEndBusyCursor()
 {

-  g_isBusy = FALSE;
+    if (--gs_busyCount > 0)
+        return;
+
+    wxSetCursor( gs_savedCursor );
+    gs_savedCursor = wxNullCursor;
+
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();

 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {

-  g_isBusy = TRUE;
+    if (gs_busyCount++ > 0)
+        return;
+
+    wxASSERT_MSG( !gs_savedCursor.Ok(),
+                  wxT("forgot to call wxEndBusyCursor, will leak memory") );
+
+    gs_savedCursor = g_globalCursor;
+
+    wxSetCursor( wxCursor(wxCURSOR_WATCH) );
+
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();

 }
 
 bool wxIsBusy()
 {
 }
 
 bool wxIsBusy()
 {

-  return g_isBusy;
+    return gs_busyCount > 0;

 }
 
 void wxSetCursor( const wxCursor& cursor )
 {
 }
 
 void wxSetCursor( const wxCursor& cursor )
 {

-  extern wxCursor *g_globalCursor;
-  if (g_globalCursor) (*g_globalCursor) = cursor;
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-  if (cursor.Ok()) {}
+    g_globalCursor = cursor;

 }
 }

-
-