#include <X11/Xlib.h>
-// ----------------------------------------------------------------------------
-// global
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// global data
+//----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
-#ifdef NEW_GTK_DND_CODE
+//----------------------------------------------------------------------------
+// standard icons
+//----------------------------------------------------------------------------
+
+/* XPM */
+static char * gv_xpm[] = {
+"40 34 3 1",
+" s None c None",
+". c black",
+"X c white",
+" ",
+" ",
+" ...... ",
+" ..XXXXXX.. ",
+" .XXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXX. ",
+" .XXX..XXXX..XXX. ",
+" ....XX....XX....XX. ",
+" .XXX.XXX..XXXX..XXX.... ",
+" .XXXXXXXXXXXXXXXXXXX.XXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
+" ..XXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXX... ",
+" ..XXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXX.XXXXXXX. ",
+" .XXXXXXX.XXXXXXX.XXXXXXX. ",
+" .XXXXXXXX.XXXXXXX.XXXXXXX. ",
+" .XXXXXXX...XXXXX...XXXXX. ",
+" .XXXXXXX. ..... ..... ",
+" ..XXXX.. ",
+" .... ",
+" ",
+" ",
+" "};
+
+/* XPM */
+static char * page_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 5 1",
+/* colors */
+" s None c None",
+". c black",
+"X c wheat",
+"o c tan",
+"O c #6699FF",
+/* pixels */
+" ................... ",
+" .XXXXXXXXXXXXXXXXX.. ",
+" .XXXXXXXXXXXXXXXXX.o. ",
+" .XXXXXXXXXXXXXXXXX.oo. ",
+" .XXXXXXXXXXXXXXXXX.ooo. ",
+" .XXXXXXXXXXXXXXXXX.oooo. ",
+" .XXXXXXXXXXXXXXXXX....... ",
+" .XXXXXOOOOOOOOOOXXXooooo. ",
+" .XXXXXXXXXXXXXXXXXXooooo. ",
+" .XXXXXOOOOOOOOOOXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXOOOOOOOOOXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXOOOOOOOOOOXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXOOOOOOOOOOXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXOOOOOOOOOXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXOOOOOOOOOOXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXOOOOOOOOOOXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXOOOOOOOOOOXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXOOOOOOOXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" .XXXXXXXXXXXXXXXXXXXXXXX. ",
+" ......................... "};
+
+
+#if (GTK_MINOR_VERSION > 0)
#include "gtk/gtkdnd.h"
#include "gtk/gtkselection.h"
+
// ----------------------------------------------------------------------------
// "drag_leave"
// ----------------------------------------------------------------------------
static void target_drag_leave( GtkWidget *WXUNUSED(widget),
- GdkDragContext *WXUNUSED(context),
- guint WXUNUSED(time) )
+ GdkDragContext *context,
+ guint WXUNUSED(time),
+ wxDropTarget *drop_target )
{
- printf( "leave.\n" );
+ /* inform the wxDropTarget about the current GdkDragContext.
+ this is only valid for the duration of this call */
+ drop_target->SetDragContext( context );
+
+ /* we don't need return values. this event is just for
+ information */
+ drop_target->OnLeave();
+
+ /* this has to be done because GDK has no "drag_enter" event */
+ drop_target->m_firstMotion = TRUE;
+
+ /* after this, invalidate the drop_target's GdkDragContext */
+ drop_target->SetDragContext( (GdkDragContext*) NULL );
}
// ----------------------------------------------------------------------------
static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
GdkDragContext *context,
- gint WXUNUSED(x),
- gint WXUNUSED(y),
- guint time )
+ gint x,
+ gint y,
+ guint time,
+ wxDropTarget *drop_target )
{
- printf( "motion.\n" );
- gdk_drag_status( context, context->suggested_action, time );
- return TRUE;
+ /* Owen Taylor: "if the coordinates not in a drop zone,
+ return FALSE, otherwise call gtk_drag_status() and
+ return TRUE" */
+
+ /* inform the wxDropTarget about the current GdkDragContext.
+ this is only valid for the duration of this call */
+ drop_target->SetDragContext( context );
+
+ if (drop_target->m_firstMotion)
+ {
+ /* the first "drag_motion" event substitutes a "drag_enter" event */
+ drop_target->OnEnter();
+ }
+
+ /* give program a chance to react (i.e. to say no by returning FALSE) */
+ bool ret = drop_target->OnMove( x, y );
+
+ /* we don't yet handle which "actions" (i.e. copy or move)
+ the target accepts. so far we simply accept the
+ suggested action. TODO. */
+ if (ret)
+ gdk_drag_status( context, context->suggested_action, time );
+
+ /* after this, invalidate the drop_target's GdkDragContext */
+ drop_target->SetDragContext( (GdkDragContext*) NULL );
+
+ /* this has to be done because GDK has no "drag_enter" event */
+ drop_target->m_firstMotion = FALSE;
+
+ return ret;
}
// ----------------------------------------------------------------------------
GdkDragContext *context,
gint x,
gint y,
- guint time )
+ guint time,
+ wxDropTarget *drop_target )
{
- printf( "drop at: %d,%d.\n", x, y );
+ /* Owen Taylor: "if the drop is not in a drop zone,
+ return FALSE, otherwise, if you aren't accepting
+ the drop, call gtk_drag_finish() with success == FALSE
+ otherwise call gtk_drag_data_get()" */
+
+// printf( "drop.\n" );
+
+ /* this seems to make a difference between not accepting
+ due to wrong target area and due to wrong format. let
+ us hope that this is not required.. */
- if (context->targets)
+ /* inform the wxDropTarget about the current GdkDragContext.
+ this is only valid for the duration of this call */
+ drop_target->SetDragContext( context );
+
+ /* inform the wxDropTarget about the current drag widget.
+ this is only valid for the duration of this call */
+ drop_target->SetDragWidget( widget );
+
+ /* inform the wxDropTarget about the current drag time.
+ this is only valid for the duration of this call */
+ drop_target->SetDragTime( time );
+
+ bool ret = drop_target->OnDrop( x, y );
+
+ if (!ret)
{
- gtk_drag_get_data( widget,
- context,
- GPOINTER_TO_INT (context->targets->data),
- time );
+ /* cancel the whole thing */
+ gtk_drag_finish( context,
+ FALSE, /* no success */
+ FALSE, /* don't delete data on dropping side */
+ time );
}
- return FALSE;
+
+ /* after this, invalidate the drop_target's GdkDragContext */
+ drop_target->SetDragContext( (GdkDragContext*) NULL );
+
+ /* after this, invalidate the drop_target's drag widget */
+ drop_target->SetDragWidget( (GtkWidget*) NULL );
+
+ /* this has to be done because GDK has no "drag_enter" event */
+ drop_target->m_firstMotion = TRUE;
+
+ return ret;
}
// ----------------------------------------------------------------------------
gint y,
GtkSelectionData *data,
guint WXUNUSED(info),
- guint time )
+ guint time,
+ wxDropTarget *drop_target )
{
- printf( "data receive at: %d,%d.\n", x, y );
-
- if ((data->length >= 0) && (data->format == 8))
+ /* Owen Taylor: "call gtk_drag_finish() with
+ success == TRUE" */
+
+// printf( "data received.\n" );
+
+ if ((data->length <= 0) || (data->format != 8))
{
- wxString str = (const char*)data->data;
- printf( "Received %s\n.", WXSTRINGCAST str );
+ /* negative data length and non 8-bit data format
+ qualifies for junk */
+ gtk_drag_finish (context, FALSE, FALSE, time);
+
+ return;
+ }
+
+ /* inform the wxDropTarget about the current GtkSelectionData.
+ this is only valid for the duration of this call */
+ drop_target->SetDragData( data );
+
+ if (drop_target->OnData( x, y ))
+ {
+ /* tell GTK that data transfer was successfull */
gtk_drag_finish( context, TRUE, FALSE, time );
- return;
}
-
- gtk_drag_finish (context, FALSE, FALSE, time);
+ else
+ {
+ /* tell GTK that data transfer was not successfull */
+ gtk_drag_finish( context, FALSE, FALSE, time );
+ }
+
+ /* after this, invalidate the drop_target's drag data */
+ drop_target->SetDragData( (GtkSelectionData*) NULL );
}
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
// wxDropTarget
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
wxDropTarget::wxDropTarget()
{
+ m_firstMotion = TRUE;
+ m_dragContext = (GdkDragContext*) NULL;
+ m_dragWidget = (GtkWidget*) NULL;
+ m_dragData = (GtkSelectionData*) NULL;
+ m_dragTime = 0;
}
wxDropTarget::~wxDropTarget()
{
}
+void wxDropTarget::OnEnter()
+{
+}
+
+void wxDropTarget::OnLeave()
+{
+}
+
+bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+{
+ return TRUE;
+}
+
+bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+{
+ return FALSE;
+}
+
+bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
+{
+ return FALSE;
+}
+
+bool wxDropTarget::RequestData( wxDataFormat format )
+{
+ if (!m_dragContext) return FALSE;
+ if (!m_dragWidget) return FALSE;
+
+ /* this should trigger an "drag_data_received" event */
+ gtk_drag_get_data( m_dragWidget,
+ m_dragContext,
+ format.GetAtom(),
+ m_dragTime );
+
+ return TRUE;
+}
+
+bool wxDropTarget::IsSupported( wxDataFormat format )
+{
+ if (!m_dragContext) return FALSE;
+
+ GList *child = m_dragContext->targets;
+ while (child)
+ {
+ GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+
+// char *name = gdk_atom_name( formatAtom );
+// if (name) printf( "Format available: %s.\n", name );
+
+ if (formatAtom == format.GetAtom()) return TRUE;
+ child = child->next;
+ }
+
+ return FALSE;
+}
+
+bool wxDropTarget::GetData( wxDataObject *data_object )
+{
+ if (!m_dragData) return FALSE;
+
+ if (m_dragData->target != data_object->GetFormat().GetAtom()) return FALSE;
+
+ if (data_object->GetFormat().GetType() == wxDF_TEXT)
+ {
+ wxTextDataObject *text_object = (wxTextDataObject*)data_object;
+ text_object->SetText( (const char*)m_dragData->data );
+ } else
+
+ if (data_object->GetFormat().GetType() == wxDF_FILENAME)
+ {
+ } else
+
+ if (data_object->GetFormat().GetType() == wxDF_PRIVATE)
+ {
+ wxPrivateDataObject *priv_object = (wxPrivateDataObject*)data_object;
+ priv_object->SetData( (const char*)m_dragData->data, (size_t)m_dragData->length );
+ }
+
+ return TRUE;
+}
+
void wxDropTarget::UnregisterWidget( GtkWidget *widget )
{
- wxCHECK_RET( widget != NULL, "unregister widget is NULL" );
+ wxCHECK_RET( widget != NULL, "unregister widget is NULL" );
- gtk_drag_dest_set( widget,
- (GtkDestDefaults) 0,
- (GtkTargetEntry*) NULL,
- 0,
- (GdkDragAction) 0 );
+ gtk_drag_dest_unset( widget );
- gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+ gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
- gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+ gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
- gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+ gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
- gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
+ gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
}
void wxDropTarget::RegisterWidget( GtkWidget *widget )
{
- wxCHECK_RET( widget != NULL, "register widget is NULL" );
-
- GtkTargetEntry format;
- format.info = 0;
- format.flags = 0;
- char buf[100];
-
- int valid = 0;
- for ( size_t i = 0; i < GetFormatCount(); i++ )
- {
- wxDataFormat df = GetFormat( i );
- switch (df)
- {
- case wxDF_TEXT:
- format.target = "text/plain";
- valid++;
- break;
- case wxDF_FILENAME:
- format.target = "file:ALL";
- valid++;
- break;
- case wxDF_PRIVATE:
- wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this;
- strcpy( buf, "applications/" );
- strcat( buf, WXSTRINGCAST pdt->GetID() );
- format.target = buf;
- valid++;
- default:
- break;
- }
- }
-
- wxASSERT_MSG( valid != 0, "No valid DnD format supported." );
-
- gtk_drag_dest_set( widget,
- GTK_DEST_DEFAULT_ALL,
- &format,
- 1,
- (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE) );
+ wxCHECK_RET( widget != NULL, "register widget is NULL" );
+
+ /* gtk_drag_dest_set() determines what default behaviour we'd like
+ GTK to supply. we don't want to specify out targets (=formats)
+ or actions in advance (i.e. not GTK_DEST_DEFAULT_MOTION and
+ not GTK_DEST_DEFAULT_DROP). instead we react individually to
+ "drag_motion" and "drag_drop" events. this makes it possible
+ to allow dropping on only a small area. we should set
+ GTK_DEST_DEFAULT_HIGHLIGHT as this will switch on the nice
+ highlighting if dragging over standard controls, but this
+ seems to be broken without the other two. */
+
+ gtk_drag_dest_set( widget,
+ (GtkDestDefaults) 0, /* no default behaviour */
+ (GtkTargetEntry*) NULL, /* we don't supply any formats here */
+ 0, /* number of targets = 0 */
+ (GdkDragAction) 0 ); /* we don't supply any actions here */
- gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
+ gtk_signal_connect( GTK_OBJECT(widget), "drag_leave",
GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
+ gtk_signal_connect( GTK_OBJECT(widget), "drag_motion",
GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
+ gtk_signal_connect( GTK_OBJECT(widget), "drag_drop",
GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
+ gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received",
GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this );
}
-// ----------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// wxTextDropTarget
-// ----------------------------------------------------------------------------
+//-------------------------------------------------------------------------
-bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) )
+bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
{
- OnDropText( x, y, (const char*)data );
- return TRUE;
+ return IsSupported( wxDF_TEXT );
}
-bool wxTextDropTarget::OnDropText( long x, long y, const char *psz )
+bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
{
- printf( "Got dropped text: %s.\n", psz );
- printf( "At x: %d, y: %d.\n", (int)x, (int)y );
- return TRUE;
+ if (IsSupported( wxDF_TEXT ))
+ {
+ RequestData( wxDF_TEXT );
+ return TRUE;
+ }
+
+ return FALSE;
}
-size_t wxTextDropTarget::GetFormatCount() const
+bool wxTextDropTarget::OnData( int x, int y )
{
- return 1;
+ wxTextDataObject data;
+ if (!GetData( &data )) return FALSE;
+
+ OnDropText( x, y, data.GetText() );
+
+ return TRUE;
}
-wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const
+//-------------------------------------------------------------------------
+// wxPrivateDropTarget
+//-------------------------------------------------------------------------
+
+wxPrivateDropTarget::wxPrivateDropTarget()
{
- return wxDF_TEXT;
+ m_id = wxTheApp->GetAppName();
}
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
+wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
+{
+ m_id = id;
+}
-bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] )
+bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
{
- 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;
+ return IsSupported( m_id );
}
-bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size )
+bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
{
- size_t number = 0;
- char *text = (char*) data;
- for (size_t i = 0; i < size; i++)
- if (text[i] == 0) number++;
+ if (!IsSupported( m_id ))
+ {
+ RequestData( m_id );
+ return FALSE;
+ }
+
+ return FALSE;
+}
+
+bool wxPrivateDropTarget::OnData( int x, int y )
+{
+ if (!IsSupported( m_id )) return FALSE;
+
+ wxPrivateDataObject data;
+ if (!GetData( &data )) return FALSE;
+
+ OnDropData( x, y, data.GetData(), data.GetSize() );
+
+ return TRUE;
+}
+
+//----------------------------------------------------------------------------
+// A drop target which accepts files (dragged from File Manager or Explorer)
+//----------------------------------------------------------------------------
+
+bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
+{
+ return IsSupported( wxDF_FILENAME );
+}
- if (number == 0) return TRUE;
+bool wxFileDropTarget::OnDrop( int x, int y )
+{
+ if (IsSupported( wxDF_FILENAME ))
+ {
+ RequestData( wxDF_FILENAME );
+ return TRUE;
+ }
- char **files = new char*[number];
+ return FALSE;
+}
+
+bool wxFileDropTarget::OnData( int x, int y )
+{
+ wxFileDataObject data;
+ if (!GetData( &data )) return FALSE;
+
+ /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */
+ size_t number = 0;
+ size_t i;
+ size_t size = data.GetFiles().Length();
+ char *text = WXSTRINGCAST data.GetFiles();
+ for ( i = 0; i < size; i++)
+ if (text[i] == 0) number++;
+
+ if (number == 0) return FALSE;
+
+ char **files = new char*[number];
- text = (char*) data;
- for (size_t i = 0; i < number; i++)
- {
- files[i] = text;
- int len = strlen( text );
- text += len+1;
- }
-
- bool ret = OnDropFiles( x, y, 1, files );
+ text = WXSTRINGCAST data.GetFiles();
+ for (i = 0; i < number; i++)
+ {
+ files[i] = text;
+ int len = strlen( text );
+ text += len+1;
+ }
+
+ OnDropFiles( x, y, number, files );
+
+ free( files );
+
+ return TRUE;
+}
+
+//----------------------------------------------------------------------------
+// "drag_data_get"
+//----------------------------------------------------------------------------
+
+static void
+source_drag_data_get (GtkWidget *WXUNUSED(widget),
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint WXUNUSED(info),
+ guint WXUNUSED(time),
+ wxDropSource *drop_source )
+{
+// char *name = gdk_atom_name( selection_data->target );
+// if (name) printf( "Format requested: %s.\n", name );
+
+ wxNode *node = drop_source->m_data->m_dataObjects.First();
+ while (node)
+ {
+ wxDataObject *data_object = (wxDataObject*) node->Data();
+ if (data_object->GetFormat().GetAtom() == selection_data->target)
+ {
+ size_t data_size = data_object->GetSize();
+ if (data_size > 0)
+ {
+ guchar *buffer = new guchar[data_size];
+ data_object->WriteData( buffer );
+
+ gtk_selection_data_set( selection_data,
+ selection_data->target,
+ 8, /* 8-bit */
+ buffer,
+ data_size );
+
+ free( buffer );
+
+ /* so far only copy, no moves. TODO. */
+ drop_source->m_retValue = wxDragCopy;
+
+ return;
+ }
+ }
+
+ node = node->Next();
+ }
+
+ drop_source->m_retValue = wxDragCancel;
+}
- free( files );
+//----------------------------------------------------------------------------
+// "drag_data_delete"
+//----------------------------------------------------------------------------
+
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+ GdkDragContext *WXUNUSED(context),
+ wxDropSource *drop_source )
+{
+// printf( "Delete the data!\n" );
+
+ drop_source->m_retValue = wxDragMove;
+}
- return ret;
+//----------------------------------------------------------------------------
+// "drag_begin"
+//----------------------------------------------------------------------------
+
+static void source_drag_begin( GtkWidget *WXUNUSED(widget),
+ GdkDragContext *WXUNUSED(context),
+ wxDropSource *WXUNUSED(drop_source) )
+{
+// printf( "drag_begin.\n" );
}
+
+//----------------------------------------------------------------------------
+// "drag_end"
+//----------------------------------------------------------------------------
-size_t wxFileDropTarget::GetFormatCount() const
+static void source_drag_end( GtkWidget *WXUNUSED(widget),
+ GdkDragContext *WXUNUSED(context),
+ wxDropSource *drop_source )
{
- return 1;
+// printf( "drag_end.\n" );
+
+ drop_source->m_waiting = FALSE;
}
+
+//---------------------------------------------------------------------------
+// wxDropSource
+//---------------------------------------------------------------------------
+
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
+{
+ g_blockEventsOnDrag = TRUE;
+ m_waiting = TRUE;
+
+ m_window = win;
+ m_widget = win->m_widget;
+ if (win->m_wxwindow) m_widget = win->m_wxwindow;
+
+ m_data = (wxDataBroker*) NULL;
+ m_retValue = wxDragCancel;
-wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const
-{
- return wxDF_FILENAME;
+ 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::wxDropSource( wxWindow *win )
+wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop )
{
- g_blockEventsOnDrag = TRUE;
+ m_waiting = 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;
-
- 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 )
+{
+ if (m_data) delete m_data;
+
+ if (data)
+ {
+ m_data = new wxDataBroker();
+ m_data->Add( data );
+ }
+ else
+ {
+ m_data = (wxDataBroker*) NULL;
+ }
}
-void wxDropSource::SetData( wxDataObject &data )
+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;
+ g_blockEventsOnDrag = FALSE;
}
wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{
- wxASSERT_MSG( m_data, "wxDragSource: no data" );
-
- if (!m_data) return (wxDragResult) wxDragNone;
- if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
-
- RegisterWindow();
-
- // TODO
+ wxASSERT_MSG( m_data, "wxDragSource: no data" );
- UnregisterWindow();
+ if (!m_data) return (wxDragResult) wxDragNone;
- g_blockEventsOnDrag = FALSE;
+ g_blockEventsOnDrag = TRUE;
- return m_retValue;
-}
-
-void wxDropSource::RegisterWindow(void)
-{
- if (!m_data) return;
+ RegisterWindow();
+
+ m_waiting = TRUE;
- wxString formats;
+ GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 );
+ gtk_target_list_add( target_list, gdk_atom_intern( "STRING", FALSE ), 0, 0 );
- wxDataFormat df = m_data->GetPreferredFormat();
-
- switch (df)
+ GdkEventMotion event;
+ event.window = m_widget->window;
+ int x = 0;
+ int y = 0;
+ GdkModifierType state;
+ gdk_window_get_pointer( event.window, &x, &y, &state );
+ event.x = x;
+ event.y = y;
+ event.state = state;
+
+ /* GTK wants to know which button was pressed which caused the dragging */
+ int button_number = 0;
+ if (event.state & GDK_BUTTON1_MASK) button_number = 1;
+ else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
+ else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
+
+ /* don't start dragging if no button is down */
+ if (button_number)
{
- case wxDF_TEXT:
- formats += "text/plain";
- break;
- case wxDF_FILENAME:
- formats += "file:ALL";
- break;
- default:
- break;
+ GdkDragContext *context = gtk_drag_begin( m_widget,
+ target_list,
+ GDK_ACTION_COPY,
+ button_number, /* number of mouse button which started drag */
+ (GdkEvent*) &event );
+
+ wxMask *mask = m_goIcon.GetMask();
+ GdkBitmap *bm = (GdkBitmap *) NULL;
+ if (mask) bm = mask->GetBitmap();
+ GdkPixmap *pm = m_goIcon.GetPixmap();
+
+ gtk_drag_set_icon_pixmap( context,
+ gtk_widget_get_colormap( m_widget ),
+ pm,
+ bm,
+ 0,
+ 0 );
+
+ gdk_flush();
+
+ while (m_waiting) wxYield();
}
-
- char *str = WXSTRINGCAST formats;
-
- // TODO
+
+ g_blockEventsOnDrag = FALSE;
+
+ UnregisterWindow();
+
+ return m_retValue;
}
-void wxDropSource::UnregisterWindow(void)
+void wxDropSource::RegisterWindow()
{
- if (!m_widget) return;
-
- // TODO
+ if (!m_widget) return;
+
+ gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get",
+ GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this);
+ gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete",
+ GTK_SIGNAL_FUNC (source_drag_data_delete), (gpointer) this );
+ gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin",
+ GTK_SIGNAL_FUNC (source_drag_begin), (gpointer) this );
+ gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end",
+ GTK_SIGNAL_FUNC (source_drag_end), (gpointer) this );
+
+}
+
+void wxDropSource::UnregisterWindow()
+{
+ if (!m_widget) return;
+
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this );
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this );
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this );
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this );
}
#else // NEW_CODE
-GtkWidget *shape_create_icon (char **data,
+//----------------------------------------------------------------------------
+// forward
+//----------------------------------------------------------------------------
+
+GtkWidget *shape_create_icon ( const wxIcon &shape,
gint x,
gint y,
gint px,
gint py,
gint window_type);
-/* XPM */
-static char * gv_xpm[] = {
-"40 34 3 1",
-" s None c None",
-". c black",
-"X c white",
-" ",
-" ",
-" ...... ",
-" ..XXXXXX.. ",
-" .XXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXX. ",
-" .XXX..XXXX..XXX. ",
-" ....XX....XX....XX. ",
-" .XXX.XXX..XXXX..XXX.... ",
-" .XXXXXXXXXXXXXXXXXXX.XXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
-" ..XXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXX... ",
-" ..XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXX.XXXXXXX. ",
-" .XXXXXXX.XXXXXXX.XXXXXXX. ",
-" .XXXXXXXX.XXXXXXX.XXXXXXX. ",
-" .XXXXXXX...XXXXX...XXXXX. ",
-" .XXXXXXX. ..... ..... ",
-" ..XXXX.. ",
-" .... ",
-" ",
-" ",
-" "};
-
-/* XPM */
-static char * page_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 5 1",
-/* colors */
-" s None c None",
-". c black",
-"X c wheat",
-"o c tan",
-"O c #6699FF",
-/* pixels */
-" ................... ",
-" .XXXXXXXXXXXXXXXXX.. ",
-" .XXXXXXXXXXXXXXXXX.o. ",
-" .XXXXXXXXXXXXXXXXX.oo. ",
-" .XXXXXXXXXXXXXXXXX.ooo. ",
-" .XXXXXXXXXXXXXXXXX.oooo. ",
-" .XXXXXXXXXXXXXXXXX....... ",
-" .XXXXXOOOOOOOOOOXXXooooo. ",
-" .XXXXXXXXXXXXXXXXXXooooo. ",
-" .XXXXXOOOOOOOOOOXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXOOOOOOOOOXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXOOOOOOOOOOXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXOOOOOOOOOOXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXOOOOOOOOOXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXOOOOOOOOOOXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXOOOOOOOOOOXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXOOOOOOOOOOXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXOOOOOOOXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXX. ",
-" ......................... "};
-
-
//-----------------------------------------------------------------------------
// globals
//-----------------------------------------------------------------------------
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, 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;
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_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;
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 );
}
-void wxDropSource::SetData( wxDataObject &data )
+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