Moved ClearModifiedStatus() to wxPropertyGridInterface

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 21f9023d29fef6eefe3f369bab87a51323fd4125..3e2a20c6320ecd7962dbb6003a6dc98d5bdc4c9d 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -17,6 +17,7 @@
     #include "wx/app.h"
     #include "wx/image.h"
     #include "wx/bitmap.h"
     #include "wx/app.h"
     #include "wx/image.h"
     #include "wx/bitmap.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>


@@ -56,7 +57,7 @@ wxCursor::wxCursor()
 {
 }
 
 {
 }
 

-wxCursor::wxCursor( wxStockCursor cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )

 {
     m_refData = new wxCursorRefData();
 
 {
     m_refData = new wxCursorRefData();
 


@@ -122,9 +123,49 @@ wxCursor::wxCursor( wxStockCursor cursorId )
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 

+
+// used in the following two ctors

 extern GtkWidget *wxGetRootWindow();
 
 extern GtkWidget *wxGetRootWindow();
 

-wxCursor::wxCursor(const char bits[], int width, int  height,
+wxCursor::wxCursor(const wxString& cursor_file,
+                   wxBitmapType type,
+                   int hotSpotX, int hotSpotY)
+{
+    /* TODO: test this code! */
+
+    // Must be an XBM file
+    if (type != wxBITMAP_TYPE_XPM) {
+        wxLogError("Invalid cursor bitmap type '%d'", type);
+        return;
+    }
+
+    // load the XPM
+    GdkBitmap *mask = NULL;
+    GdkBitmap *data = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window,
+                                                  &mask, NULL, cursor_file.mb_str() );
+    if (!data)
+        return;
+
+    // check given hotspot
+    gint w, h;
+    gdk_drawable_get_size( data, &w, &h );
+    if (hotSpotX < 0 || hotSpotX >= w)
+        hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= h)
+        hotSpotY = 0;
+
+    // create the real cursor
+    m_refData = new wxCursorRefData;
+    M_CURSORDATA->m_cursor =
+        gdk_cursor_new_from_pixmap( data, mask,
+                                    wxBLACK->GetColor(), wxWHITE->GetColor(),
+                                    hotSpotX, hotSpotY );
+
+    g_object_unref (data);
+    g_object_unref (mask);
+}
+
+wxCursor::wxCursor(const char bits[], int width, int height,

                    int hotSpotX, int hotSpotY,
                    const char maskBits[], const wxColour *fg, const wxColour *bg)
 {
                    int hotSpotX, int hotSpotY,
                    const char maskBits[], const wxColour *fg, const wxColour *bg)
 {