X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..c626a8b797d2819e1e14110d77c04a530fd3b6b4:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index d347412089..5ea4529238 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -102,10 +102,10 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), if ((data->length >= 0) && (data->format == 8)) { - wxString str = (const char*)data->data; - printf( "Received %s\n.", WXSTRINGCAST str ); - gtk_drag_finish( context, TRUE, FALSE, time ); - return; + wxString str = (const char*)data->data; + printf( "Received %s\n.", WXSTRINGCAST str ); + gtk_drag_finish( context, TRUE, FALSE, time ); + return; } gtk_drag_finish (context, FALSE, FALSE, time); @@ -153,6 +153,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) GtkTargetEntry format; format.info = 0; format.flags = 0; + char buf[100]; int valid = 0; for ( size_t i = 0; i < GetFormatCount(); i++ ) @@ -168,6 +169,11 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) format.target = "file:ALL"; valid++; break; + case wxDF_PRIVATE: + wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; + strcpy( buf, WXSTRINGCAST pdt->GetID() ); + format.target = buf; + valid++; default: break; } @@ -240,8 +246,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for (i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -249,7 +256,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); @@ -372,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, @@ -465,6 +472,36 @@ static char * page_xpm[] = { " ......................... "}; +//----------------------------------------------------------------------------- +// globals +//----------------------------------------------------------------------------- + +wxDropSource *gs_currentDropSource = (wxDropSource*) NULL; + +//----------------------------------------------------------------------------- +// "drop_enter_event" +//----------------------------------------------------------------------------- + +static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), + GdkEventDropEnter *WXUNUSED(event), + wxDropTarget *target ) +{ + if (target) + target->OnEnter(); +} + +//----------------------------------------------------------------------------- +// "drop_leave_event" +//----------------------------------------------------------------------------- + +static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), + GdkEventDropLeave *WXUNUSED(event), + wxDropTarget *target ) +{ + if (target) + target->OnLeave(); +} + //----------------------------------------------------------------------------- // "drop_data_available_event" //----------------------------------------------------------------------------- @@ -478,9 +515,9 @@ static void gtk_target_callback( GtkWidget *widget, int x = 0; int y = 0; gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL ); - -// printf( "Drop data is of type %s.\n", event->data_type ); - +/* + printf( "Drop data is of type %s.\n", event->data_type ); +*/ target->OnDrop( x, y, (const void*)event->data, (size_t)event->data_numbytes ); } @@ -496,10 +533,17 @@ static void gtk_target_callback( GtkWidget *widget, wxDropTarget::wxDropTarget() { + m_format = (wxDataFormat*) NULL; } wxDropTarget::~wxDropTarget() { + if (m_format) delete m_format; +} + +wxDataFormat &wxDropTarget::GetFormat(size_t n) const +{ + return (*m_format); } void wxDropTarget::UnregisterWidget( GtkWidget *widget ) @@ -519,36 +563,58 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) for ( size_t i = 0; i < GetFormatCount(); i++ ) { - wxDataFormat df = GetFormat( i ); - switch (df) + switch (GetFormat(i).GetType()) { case wxDF_TEXT: - if (i > 0) formats += ";"; - formats += "text/plain"; - valid++; - break; - case wxDF_FILENAME: - if (i > 0) formats += ";"; - formats += "file:ALL"; - valid++; - break; - default: + { + if (i > 0) formats += ";"; + formats += "text/plain"; + valid++; + break; + } + case wxDF_FILENAME: + { + if (i > 0) formats += ";"; + formats += "file:ALL"; + valid++; + break; + } + case wxDF_PRIVATE: + { + if (i > 0) formats += ";"; + wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; + formats += pdt->GetId(); + valid++; + break; + } + default: break; } } char *str = WXSTRINGCAST formats; - + gtk_widget_dnd_drop_set( widget, TRUE, &str, valid, FALSE ); gtk_signal_connect( GTK_OBJECT(widget), "drop_data_available_event", GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drop_enter_event", + GTK_SIGNAL_FUNC(gtk_target_enter_callback), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drop_leave_event", + GTK_SIGNAL_FUNC(gtk_target_leave_callback), (gpointer) this ); } // ---------------------------------------------------------------------------- // wxTextDropTarget // ---------------------------------------------------------------------------- +wxTextDropTarget::wxTextDropTarget() +{ + m_format = new wxDataFormat( wxDF_TEXT ); +} + bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) { OnDropText( x, y, (const char*)data ); @@ -557,8 +623,10 @@ bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) { +/* printf( "Got dropped text: %s.\n", psz ); printf( "At x: %d, y: %d.\n", (int)x, (int)y ); +*/ return TRUE; } @@ -567,32 +635,56 @@ size_t wxTextDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const +// ---------------------------------------------------------------------------- +// wxPrivateDropTarget +// ---------------------------------------------------------------------------- + +wxPrivateDropTarget::wxPrivateDropTarget() +{ + m_id = wxTheApp->GetAppName(); + m_format = new wxDataFormat( m_id ); +} + +void wxPrivateDropTarget::SetId( const wxString& id ) +{ + m_id = id; + m_format->SetId( id ); +} + +size_t wxPrivateDropTarget::GetFormatCount() const { - return wxDF_TEXT; + return 1; } // ---------------------------------------------------------------------------- // wxFileDropTarget // ---------------------------------------------------------------------------- +wxFileDropTarget::wxFileDropTarget() +{ + m_format = new wxDataFormat( wxDF_FILENAME ); +} + bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) { printf( "Got %d dropped files.\n", (int)nFiles ); printf( "At x: %d, y: %d.\n", (int)x, (int)y ); + for (size_t i = 0; i < nFiles; i++) { printf( aszFiles[i] ); printf( "\n" ); } + return TRUE; } bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for ( i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -600,7 +692,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); @@ -619,128 +711,196 @@ size_t wxFileDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_FILENAME; -} - //------------------------------------------------------------------------- // wxDropSource //------------------------------------------------------------------------- static void shape_motion (GtkWidget *widget, - GdkEventMotion */*event*/); + GdkEventMotion * /*event*/); //----------------------------------------------------------------------------- -// drag request +// "drag_request_event" +//----------------------------------------------------------------------------- -void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source ) +void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSource *source ) { - wxDataObject *data = source->m_data; - - switch (data->GetFormat()) + wxDataBroker *data = source->m_data; + + if (!data) return; + + wxNode *node = data->m_dataObjects.First(); { - case wxDF_TEXT: + wxDataObject *dobj = (wxDataObject*) node->Data(); + + if ((strcmp(event->data_type,"file:ALL") == 0) && + (dobj->GetFormat().GetType() == wxDF_FILENAME)) { - wxTextDataObject *text_object = (wxTextDataObject*) data; + wxFileDataObject *file_object = (wxFileDataObject*) dobj; - wxString text = text_object->GetText(); + wxString text = file_object->GetFiles(); char *s = WXSTRINGCAST text; gtk_widget_dnd_data_set( widget, - event, + (GdkEvent*)event, (unsigned char*) s, (int) text.Length()+1 ); - break; + source->m_retValue = wxDragCopy; + + return; } - case wxDF_FILENAME: + if ((strcmp(event->data_type,"text/plain") == 0) && + (dobj->GetFormat().GetType() == wxDF_TEXT)) { - wxFileDataObject *file_object = (wxFileDataObject*) data; + wxTextDataObject *text_object = (wxTextDataObject*) dobj; - wxString text = file_object->GetFiles(); + wxString text = text_object->GetText(); char *s = WXSTRINGCAST text; gtk_widget_dnd_data_set( widget, - event, + (GdkEvent*)event, (unsigned char*) s, (int) text.Length()+1 ); - break; + source->m_retValue = wxDragCopy; + + return; } - default: + if (dobj->GetFormat().GetType() == wxDF_PRIVATE) { - return; + wxPrivateDataObject *pdo = (wxPrivateDataObject*) dobj; + + if (pdo->GetId() == event->data_type) + { + gtk_widget_dnd_data_set( widget, + (GdkEvent*)event, + (unsigned char*) pdo->GetData(), + (int) pdo->GetSize() ); + + source->m_retValue = wxDragCopy; + + return; + } } + + node = node->Next(); } +} + +wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) +{ + g_blockEventsOnDrag = TRUE; + + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; - source->m_retValue = wxDragCopy; + m_data = (wxDataBroker*) NULL; + m_retValue = wxDragCancel; + + 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( wxWindow *win ) +wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop ) { - g_blockEventsOnDrag = TRUE; + g_blockEventsOnDrag = TRUE; - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; - m_data = (wxDataObject *) NULL; - m_retValue = wxDragCancel; + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + 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( wxDataBroker *data, wxWindow *win ) { - g_blockEventsOnDrag = TRUE; + g_blockEventsOnDrag = TRUE; - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; - m_data = &data; + m_data = data; - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); + m_goaheadCursor = wxCursor( wxCURSOR_HAND ); } -void wxDropSource::SetData( wxDataObject &data ) +void wxDropSource::SetData( wxDataObject *data ) { - m_data = &data; + if (m_data) delete m_data; + + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } +} + +void wxDropSource::SetData( wxDataBroker *data ) +{ + if (m_data) delete m_data; + + m_data = data; } wxDropSource::~wxDropSource(void) { -// if (m_data) delete m_data; + if (m_data) delete m_data; - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = FALSE; } wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { - if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone; - if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone; + if (gdk_dnd.dnd_grabbed) return (wxDragResult) wxDragNone; + if (gdk_dnd.drag_really) return (wxDragResult) wxDragNone; - wxASSERT_MSG( m_data, "wxDragSource: no data" ); + wxASSERT_MSG( m_data, "wxDragSource: no data" ); - if (!m_data) return (wxDragResult) wxDragNone; + if (!m_data) return (wxDragResult) wxDragNone; - static GtkWidget *drag_icon = (GtkWidget*) NULL; - static GtkWidget *drop_icon = (GtkWidget*) NULL; + static GtkWidget *drag_icon = (GtkWidget*) NULL; + static GtkWidget *drop_icon = (GtkWidget*) NULL; - GdkPoint hotspot_1 = {0,-5 }; + GdkPoint hotspot_1 = {0,-5 }; - if (!drag_icon) - { - drag_icon = shape_create_icon ( gv_xpm, + if (!drag_icon) + { + drag_icon = shape_create_icon ( m_stopIcon, 440, 140, 0,0, GTK_WINDOW_POPUP); gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy", @@ -748,13 +908,13 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) &drag_icon); gtk_widget_hide (drag_icon); - } + } - GdkPoint hotspot_2 = {-5,-5}; + GdkPoint hotspot_2 = {-5,-5}; - if (!drop_icon) - { - drop_icon = shape_create_icon ( page_xpm, + if (!drop_icon) + { + drop_icon = shape_create_icon ( m_goIcon, 440, 140, 0,0, GTK_WINDOW_POPUP); gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy", @@ -762,7 +922,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) &drop_icon); gtk_widget_hide (drop_icon); - } + } gdk_dnd_set_drag_shape( drag_icon->window, @@ -771,101 +931,115 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) &hotspot_2); - GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window; + GdkWindowPrivate *wp = (GdkWindowPrivate*) m_widget->window; - RegisterWindow(); + RegisterWindow(); - gdk_dnd.drag_perhaps = TRUE; + gdk_dnd.drag_perhaps = TRUE; - gdk_dnd.dnd_drag_start.x = 5; - gdk_dnd.dnd_drag_start.y = 5; - gdk_dnd.real_sw = wp; + gdk_dnd.dnd_drag_start.x = 5; + gdk_dnd.dnd_drag_start.y = 5; + gdk_dnd.real_sw = wp; - if (gdk_dnd.drag_startwindows) - { - g_free( gdk_dnd.drag_startwindows ); - gdk_dnd.drag_startwindows = (GdkWindow **) NULL; - } - gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0; + if (gdk_dnd.drag_startwindows) + { + g_free( gdk_dnd.drag_startwindows ); + gdk_dnd.drag_startwindows = (GdkWindow **) NULL; + } + gdk_dnd.drag_numwindows = gdk_dnd.drag_really = 0; - XWindowAttributes dnd_winattr; - XGetWindowAttributes( gdk_display, wp->xwindow, &dnd_winattr ); - wp->dnd_drag_savedeventmask = dnd_winattr.your_event_mask; + XWindowAttributes dnd_winattr; + XGetWindowAttributes( gdk_display, wp->xwindow, &dnd_winattr ); + wp->dnd_drag_savedeventmask = dnd_winattr.your_event_mask; - gdk_dnd_drag_addwindow( m_widget->window ); + gdk_dnd_drag_addwindow( m_widget->window ); - GdkEventDragBegin ev; - ev.type = GDK_DRAG_BEGIN; - ev.window = m_widget->window; - ev.u.allflags = 0; - ev.u.flags.protocol_version = DND_PROTOCOL_VERSION; + GdkEventDragBegin ev; + ev.type = GDK_DRAG_BEGIN; + ev.window = m_widget->window; + ev.u.allflags = 0; + ev.u.flags.protocol_version = DND_PROTOCOL_VERSION; - gdk_event_put( (GdkEvent*)&ev ); + gdk_event_put( (GdkEvent*)&ev ); - XGrabPointer( gdk_display, wp->xwindow, False, - ButtonMotionMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, - GrabModeAsync, GrabModeAsync, gdk_root_window, None, CurrentTime ); + XGrabPointer( gdk_display, wp->xwindow, False, + ButtonMotionMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, + GrabModeAsync, GrabModeAsync, gdk_root_window, None, CurrentTime ); - gdk_dnd_set_drag_cursors( m_defaultCursor.GetCursor(), m_goaheadCursor.GetCursor() ); + gdk_dnd_set_drag_cursors( m_defaultCursor.GetCursor(), m_goaheadCursor.GetCursor() ); - gdk_dnd.dnd_grabbed = TRUE; - gdk_dnd.drag_really = 1; + gdk_dnd.dnd_grabbed = TRUE; + gdk_dnd.drag_really = 1; - int x = 0; - int y = 0; - wxGetMousePosition( &x, &y ); + int x = 0; + int y = 0; + wxGetMousePosition( &x, &y ); - gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE ); - -/* - shape_motion( drag_icon, (GdkEventMotion *)NULL ); - shape_motion( drop_icon, (GdkEventMotion *)NULL ); -*/ - - while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield(); + gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE ); + + gs_currentDropSource = this; + + while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield(); + + gs_currentDropSource = (wxDropSource*) NULL; - UnregisterWindow(); + UnregisterWindow(); - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = FALSE; - return m_retValue; + return m_retValue; } void wxDropSource::RegisterWindow(void) { - if (!m_data) return; + if (!m_data) return; - wxString formats; + wxString formats; - wxDataFormat df = m_data->GetFormat(); - - switch (df) + wxNode *node = m_data->m_dataObjects.First(); + while (node) { - case wxDF_TEXT: - formats += "text/plain"; - break; - case wxDF_FILENAME: - formats += "file:ALL"; - break; - default: - break; + wxDataObject* dobj = (wxDataObject*) node->Data(); + + switch (dobj->GetFormat().GetType()) + { + case wxDF_TEXT: + { + formats += "text/plain"; + break; + } + case wxDF_FILENAME: + { + formats += "file:ALL"; + break; + } + case wxDF_PRIVATE: + { + wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data; + formats += pdo->GetId(); + break; + } + default: + break; + } + node = node->Next(); } - char *str = WXSTRINGCAST formats; + char *str = WXSTRINGCAST formats; - gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 ); + gtk_widget_dnd_drag_set( m_widget, TRUE, &str, 1 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", - GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(m_widget), "drag_request_event", + GTK_SIGNAL_FUNC(gtk_drag_callback), (gpointer)this ); } void wxDropSource::UnregisterWindow(void) { - if (!m_widget) return; + if (!m_widget) return; - gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 ); + gtk_widget_dnd_drag_set( m_widget, FALSE, (gchar **) NULL, 0 ); - gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this ); + gtk_signal_disconnect_by_data( GTK_OBJECT(m_widget), (gpointer)this ); } @@ -909,7 +1083,7 @@ shape_released (GtkWidget *widget) static void shape_motion (GtkWidget *widget, - GdkEventMotion */*event*/) + GdkEventMotion * /*event*/ ) { gint xp, yp; CursorOffset * p; @@ -921,36 +1095,27 @@ shape_motion (GtkWidget *widget, * Can't use event->x / event->y here * because I need absolute coordinates. */ + gdk_window_get_pointer (root_win, &xp, &yp, &mask); gtk_widget_set_uposition (widget, xp - p->x, yp - p->y); + + if (gs_currentDropSource) gs_currentDropSource->GiveFeedback( wxDragCopy, FALSE ); } 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); @@ -963,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", @@ -981,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);