custom icons for DnD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index f2f81e8550b14cd5ccd9316051a9284f337a3d86..dc0a2d850dda8bd2aa7fe4624304eaffa63ac5d7 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -23,6 +23,8 @@
 #include "wx/string.h"
 #include "wx/dataobj.h"
 #include "wx/cursor.h"
+#include "wx/icon.h"
+#include "wx/gdicmn.h"
 
 //-------------------------------------------------------------------------
 // conditional compilation
@@ -159,10 +161,10 @@ class wxDropSource: public wxObject
   public:
 
     /* constructor. set data later with SetData() */
-    wxDropSource( wxWindow *win );
+    wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting one data object */
-    wxDropSource( wxDataObject *data, wxWindow *win );
+    wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting several data objects via wxDataBroker */
     wxDropSource( wxDataBroker *data, wxWindow *win );
@@ -193,6 +195,9 @@ class wxDropSource: public wxObject
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;
 };
 
 #endif

diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index f2f81e8550b14cd5ccd9316051a9284f337a3d86..dc0a2d850dda8bd2aa7fe4624304eaffa63ac5d7 100644 (file)
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -23,6 +23,8 @@
 #include "wx/string.h"
 #include "wx/dataobj.h"
 #include "wx/cursor.h"
+#include "wx/icon.h"
+#include "wx/gdicmn.h"
 
 //-------------------------------------------------------------------------
 // conditional compilation
@@ -159,10 +161,10 @@ class wxDropSource: public wxObject
   public:
 
     /* constructor. set data later with SetData() */
-    wxDropSource( wxWindow *win );
+    wxDropSource( wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting one data object */
-    wxDropSource( wxDataObject *data, wxWindow *win );
+    wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go = wxNullIcon, const wxIcon &stop = wxNullIcon );
     
     /* constructor for setting several data objects via wxDataBroker */
     wxDropSource( wxDataBroker *data, wxWindow *win );
@@ -193,6 +195,9 @@ class wxDropSource: public wxObject
     
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
+    
+    wxIcon        m_goIcon;
+    wxIcon        m_stopIcon;
 };
 
 #endif

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index a2e20c79924e1bdb6c4e4bf6bdd76ed627f712c7..f0f0469acf98d6a355dc3294557edbed2c4941c5 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -309,7 +309,7 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
     wxTextDataObject textData(m_strText);
     wxDropSource dragSource( textData, this );
 #else
-    wxDropSource dragSource( new wxTextDataObject (m_strText), this );
+    wxDropSource dragSource( new wxTextDataObject (m_strText), this, wxIcon(mondrian_xpm) );
 #endif
     const char *pc;
 

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index e4fdd8318e9e82897eaaf29ca96a54f2ef0f1120..5ea4529238e87816b880facd213aab65f11ff8df 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -379,7 +379,7 @@ void wxDropSource::UnregisterWindow(void)
 
 #else  // NEW_CODE
 
-GtkWidget *shape_create_icon (char     **data,
+GtkWidget *shape_create_icon ( const wxIcon &shape,
                              gint      x,
                              gint      y,
                              gint      px,
@@ -792,7 +792,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSou
    }
 }
 
-wxDropSource::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;
   
@@ -805,9 +805,14 @@ wxDropSource::wxDropSource( wxWindow *win )
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win )
+wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;
   
@@ -828,6 +833,11 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win )
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
 wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
@@ -890,7 +900,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
       
     if (!drag_icon)
     {
-         drag_icon = shape_create_icon ( gv_xpm,
+         drag_icon = shape_create_icon ( m_stopIcon,
                                         440, 140, 0,0, GTK_WINDOW_POPUP);
          
          gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
@@ -904,7 +914,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
        
     if (!drop_icon)
     {
-         drop_icon = shape_create_icon ( page_xpm,
+         drop_icon = shape_create_icon ( m_goIcon,
                                         440, 140, 0,0, GTK_WINDOW_POPUP);
          
          gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
@@ -1093,31 +1103,19 @@ shape_motion (GtkWidget      *widget,
 }
 
 GtkWidget *
-shape_create_icon (char     **data,
+shape_create_icon (const wxIcon &shape,
                   gint      x,
                   gint      y,
                   gint      px,
                   gint      py,
                   gint      window_type)
 {
-  GtkWidget *window;
-  GtkWidget *pixmap;
-  GtkWidget *fixed;
-  CursorOffset* icon_pos;
-  GdkGC* gc;
-  GdkBitmap *gdk_pixmap_mask;
-  GdkPixmap *gdk_pixmap;
-  GtkStyle *style;
-
-  style = gtk_widget_get_default_style ();
-  gc = style->black_gc;        
-
   /*
    * GDK_WINDOW_TOPLEVEL works also, giving you a title border
    */
-  window = gtk_window_new ((GtkWindowType)window_type);
+  GtkWidget *window = gtk_window_new ((GtkWindowType)window_type);
   
-  fixed = gtk_fixed_new ();
+  GtkWidget *fixed = gtk_fixed_new ();
   gtk_widget_set_usize (fixed, 100,100);
   gtk_container_add (GTK_CONTAINER (window), fixed);
   gtk_widget_show (fixed);
@@ -1130,15 +1128,14 @@ shape_create_icon (char     **data,
 
   gtk_widget_realize (window);
   
-  gdk_pixmap = gdk_pixmap_create_from_xpm_d (window->window, &gdk_pixmap_mask, 
-                                          &style->bg[GTK_STATE_NORMAL],
-                                          (gchar**) data );
+  GdkBitmap *mask = (GdkBitmap*) NULL;
+  if (shape.GetMask()) mask = shape.GetMask()->GetBitmap();
 
-  pixmap = gtk_pixmap_new (gdk_pixmap, gdk_pixmap_mask);
+  GtkWidget *pixmap = gtk_pixmap_new (shape.GetPixmap(), mask);
   gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
   gtk_widget_show (pixmap);
   
-  gtk_widget_shape_combine_mask (window, gdk_pixmap_mask, px,py);
+  gtk_widget_shape_combine_mask (window, mask, px,py);
 
 
   gtk_signal_connect (GTK_OBJECT (window), "button_press_event",
@@ -1148,7 +1145,7 @@ shape_create_icon (char     **data,
   gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event",
                      GTK_SIGNAL_FUNC (shape_motion),NULL);
 
-  icon_pos = g_new (CursorOffset, 1);
+  CursorOffset*icon_pos = g_new (CursorOffset, 1);
   gtk_object_set_user_data(GTK_OBJECT(window), icon_pos);
 
   gtk_widget_set_uposition (window, x, y);

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index e4fdd8318e9e82897eaaf29ca96a54f2ef0f1120..5ea4529238e87816b880facd213aab65f11ff8df 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -379,7 +379,7 @@ void wxDropSource::UnregisterWindow(void)
 
 #else  // NEW_CODE
 
-GtkWidget *shape_create_icon (char     **data,
+GtkWidget *shape_create_icon ( const wxIcon &shape,
                              gint      x,
                              gint      y,
                              gint      px,
@@ -792,7 +792,7 @@ void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSou
    }
 }
 
-wxDropSource::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;
   
@@ -805,9 +805,14 @@ wxDropSource::wxDropSource( wxWindow *win )
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
-wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win )
+wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
 {
     g_blockEventsOnDrag = TRUE;
   
@@ -828,6 +833,11 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win )
 
     m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
     m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+    
+    m_goIcon = go;
+    if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+    m_stopIcon = stop;
+    if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
 }
 
 wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
@@ -890,7 +900,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
       
     if (!drag_icon)
     {
-         drag_icon = shape_create_icon ( gv_xpm,
+         drag_icon = shape_create_icon ( m_stopIcon,
                                         440, 140, 0,0, GTK_WINDOW_POPUP);
          
          gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy",
@@ -904,7 +914,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
        
     if (!drop_icon)
     {
-         drop_icon = shape_create_icon ( page_xpm,
+         drop_icon = shape_create_icon ( m_goIcon,
                                         440, 140, 0,0, GTK_WINDOW_POPUP);
          
          gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy",
@@ -1093,31 +1103,19 @@ shape_motion (GtkWidget      *widget,
 }
 
 GtkWidget *
-shape_create_icon (char     **data,
+shape_create_icon (const wxIcon &shape,
                   gint      x,
                   gint      y,
                   gint      px,
                   gint      py,
                   gint      window_type)
 {
-  GtkWidget *window;
-  GtkWidget *pixmap;
-  GtkWidget *fixed;
-  CursorOffset* icon_pos;
-  GdkGC* gc;
-  GdkBitmap *gdk_pixmap_mask;
-  GdkPixmap *gdk_pixmap;
-  GtkStyle *style;
-
-  style = gtk_widget_get_default_style ();
-  gc = style->black_gc;        
-
   /*
    * GDK_WINDOW_TOPLEVEL works also, giving you a title border
    */
-  window = gtk_window_new ((GtkWindowType)window_type);
+  GtkWidget *window = gtk_window_new ((GtkWindowType)window_type);
   
-  fixed = gtk_fixed_new ();
+  GtkWidget *fixed = gtk_fixed_new ();
   gtk_widget_set_usize (fixed, 100,100);
   gtk_container_add (GTK_CONTAINER (window), fixed);
   gtk_widget_show (fixed);
@@ -1130,15 +1128,14 @@ shape_create_icon (char     **data,
 
   gtk_widget_realize (window);
   
-  gdk_pixmap = gdk_pixmap_create_from_xpm_d (window->window, &gdk_pixmap_mask, 
-                                          &style->bg[GTK_STATE_NORMAL],
-                                          (gchar**) data );
+  GdkBitmap *mask = (GdkBitmap*) NULL;
+  if (shape.GetMask()) mask = shape.GetMask()->GetBitmap();
 
-  pixmap = gtk_pixmap_new (gdk_pixmap, gdk_pixmap_mask);
+  GtkWidget *pixmap = gtk_pixmap_new (shape.GetPixmap(), mask);
   gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
   gtk_widget_show (pixmap);
   
-  gtk_widget_shape_combine_mask (window, gdk_pixmap_mask, px,py);
+  gtk_widget_shape_combine_mask (window, mask, px,py);
 
 
   gtk_signal_connect (GTK_OBJECT (window), "button_press_event",
@@ -1148,7 +1145,7 @@ shape_create_icon (char     **data,
   gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event",
                      GTK_SIGNAL_FUNC (shape_motion),NULL);
 
-  icon_pos = g_new (CursorOffset, 1);
+  CursorOffset*icon_pos = g_new (CursorOffset, 1);
   gtk_object_set_user_data(GTK_OBJECT(window), icon_pos);
 
   gtk_widget_set_uposition (window, x, y);