break;
case wxDF_PRIVATE:
wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
- strcpy( buf, "applications/" );
- strcat( buf, WXSTRINGCAST pdt->GetID() );
+ strcpy( buf, WXSTRINGCAST pdt->GetID() );
format.target = buf;
valid++;
default:
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;
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 );
#else // NEW_CODE
-GtkWidget *shape_create_icon (char **data,
+GtkWidget *shape_create_icon ( const wxIcon &shape,
gint x,
gint y,
gint px,
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 )
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 += ";";
wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
- formats += "applications/";
formats += pdt->GetId();
valid++;
break;
// 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 );
return 1;
}
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
- return wxDF_TEXT;
-}
-
// ----------------------------------------------------------------------------
// wxPrivateDropTarget
// ----------------------------------------------------------------------------
wxPrivateDropTarget::wxPrivateDropTarget()
{
m_id = wxTheApp->GetAppName();
+ m_format = new wxDataFormat( m_id );
}
-size_t wxPrivateDropTarget::GetFormatCount() const
+void wxPrivateDropTarget::SetId( const wxString& id )
{
- return 1;
+ m_id = id;
+ m_format->SetId( id );
}
-wxDataFormat wxPrivateDropTarget::GetFormat(size_t WXUNUSED(n)) const
+size_t wxPrivateDropTarget::GetFormatCount() const
{
- return wxDF_PRIVATE;
+ 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 );
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;
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 );
return 1;
}
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
- return wxDF_FILENAME;
-}
-
//-------------------------------------------------------------------------
// wxDropSource
//-------------------------------------------------------------------------
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_PRIVATE:
- {
- wxPrivateDataObject *pdo = (wxPrivateDataObject*) data;
-
- gtk_widget_dnd_data_set( widget,
- event,
- (unsigned char*) pdo->GetData(),
- (int) pdo->GetDataSize() );
-
- break;
- }
- 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();
}
-
- source->m_retValue = wxDragCopy;
}
-wxDropSource::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
{
g_blockEventsOnDrag = TRUE;
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
- m_data = (wxDataObject *) NULL;
+ 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( wxDataObject &data, wxWindow *win )
+wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
{
g_blockEventsOnDrag = TRUE;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
- m_data = &data;
+ 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_goIcon = go;
+ if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
+ m_stopIcon = stop;
+ if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
}
-void wxDropSource::SetData( wxDataObject &data )
+wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
+{
+ g_blockEventsOnDrag = TRUE;
+
+ m_window = win;
+ m_widget = win->m_widget;
+ if (win->m_wxwindow) m_widget = win->m_wxwindow;
+ m_retValue = wxDragCancel;
+
+ m_data = data;
+
+ m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
+ m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+}
+
+void wxDropSource::SetData( wxDataObject *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 )
{
- m_data = &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;
}
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",
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",
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;
- }
- case wxDF_PRIVATE:
- {
- wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data;
- formats += "applications/";
- formats += pdo->GetId();
- 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;
}
- default:
- break;
+ node = node->Next();
}
char *str = WXSTRINGCAST formats;
}
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);
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",
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);
projects / wxWidgets.git / blobdiff