Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxDropSource::GiveFeedBack().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-22 22:43:21 +00:00
parent dcd307ee1f
commit 7b5d569973
4 changed files with 168 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/gtk/dnd.h
View File

@@ -109,14 +109,12 @@ class wxDropSource: public wxDropSourceBase
public: public:
/* constructor. set data later with SetData() */ /* constructor. set data later with SetData() */
wxDropSource( wxWindow *win, wxDropSource( wxWindow *win,
const wxIcon &go = wxNullIcon, const wxIcon &go = wxNullIcon );
const wxIcon &stop = wxNullIcon );
/* constructor for setting one data object */ /* constructor for setting one data object */
wxDropSource( wxDataObject& data, wxDropSource( wxDataObject& data,
wxWindow *win, wxWindow *win,
const wxIcon &go = wxNullIcon, const wxIcon &go = wxNullIcon );
const wxIcon &stop = wxNullIcon );
~wxDropSource(); ~wxDropSource();
@@ -127,17 +125,17 @@ public:
void RegisterWindow(); void RegisterWindow();
void UnregisterWindow(); void UnregisterWindow();
GtkWidget *m_widget; void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
wxWindow *m_window;
wxDragResult m_retValue; GtkWidget *m_widget;
GtkWidget *m_iconWindow;
wxCursor m_defaultCursor; GdkDragContext *m_dragContext;
wxCursor m_goaheadCursor; wxWindow *m_window;
wxIcon m_goIcon; wxDragResult m_retValue;
wxIcon m_stopIcon; wxIcon m_icon;
bool m_waiting; bool m_waiting;
}; };
#endif #endif

28
include/wx/gtk1/dnd.h
View File

@@ -109,14 +109,12 @@ class wxDropSource: public wxDropSourceBase
public: public:
/* constructor. set data later with SetData() */ /* constructor. set data later with SetData() */
wxDropSource( wxWindow *win, wxDropSource( wxWindow *win,
const wxIcon &go = wxNullIcon, const wxIcon &go = wxNullIcon );
const wxIcon &stop = wxNullIcon );
/* constructor for setting one data object */ /* constructor for setting one data object */
wxDropSource( wxDataObject& data, wxDropSource( wxDataObject& data,
wxWindow *win, wxWindow *win,
const wxIcon &go = wxNullIcon, const wxIcon &go = wxNullIcon );
const wxIcon &stop = wxNullIcon );
~wxDropSource(); ~wxDropSource();
@@ -127,17 +125,17 @@ public:
void RegisterWindow(); void RegisterWindow();
void UnregisterWindow(); void UnregisterWindow();
GtkWidget *m_widget; void PrepareIcon( int hot_x, int hot_y, GdkDragContext *context );
wxWindow *m_window;
wxDragResult m_retValue; GtkWidget *m_widget;
GtkWidget *m_iconWindow;
wxCursor m_defaultCursor; GdkDragContext *m_dragContext;
wxCursor m_goaheadCursor; wxWindow *m_window;
wxIcon m_goIcon; wxDragResult m_retValue;
wxIcon m_stopIcon; wxIcon m_icon;
bool m_waiting; bool m_waiting;
}; };
#endif #endif

144
src/gtk/dnd.cpp
View File

@@ -54,47 +54,6 @@ extern bool g_blockEventsOnDrag;
// standard icons // 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 */ /* XPM */
static char * page_xpm[] = { static char * page_xpm[] = {
/* width height ncolors chars_per_pixel */ /* width height ncolors chars_per_pixel */
@@ -206,8 +165,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
if (ret) if (ret)
{ {
GdkDragAction action = GDK_ACTION_MOVE; GdkDragAction action = GDK_ACTION_MOVE;
if (result == wxDragCopy) action == GDK_ACTION_COPY; if (result == wxDragCopy) action = GDK_ACTION_COPY;
gdk_drag_status( context, context->suggested_action, time ); gdk_drag_status( context, action, time );
} }
/* after this, invalidate the drop_target's GdkDragContext */ /* after this, invalidate the drop_target's GdkDragContext */
@@ -678,49 +637,62 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget),
drop_source->m_waiting = FALSE; drop_source->m_waiting = FALSE;
} }
//-----------------------------------------------------------------------------
// "configure_event" from m_iconWindow
//-----------------------------------------------------------------------------
static gint
gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
{
if (g_isIdle)
wxapp_install_idle_handler();
wxDragResult action = wxDragNone;
if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
source->GiveFeedback( action, FALSE );
return 0;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxDropSource // wxDropSource
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
{ {
g_blockEventsOnDrag = TRUE; g_blockEventsOnDrag = TRUE;
m_waiting = TRUE; m_waiting = TRUE;
m_iconWindow = (GtkWidget*) NULL;
m_window = win; m_window = win;
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragCancel;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_icon = icon;
m_goaheadCursor = wxCursor( wxCURSOR_HAND ); if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
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 &icon )
const wxIcon &go, const wxIcon &stop )
{ {
m_waiting = TRUE; m_waiting = TRUE;
SetData( data ); SetData( data );
m_iconWindow = (GtkWidget*) NULL;
m_window = win; m_window = win;
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragCancel;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_icon = icon;
m_goaheadCursor = wxCursor( wxCURSOR_HAND ); if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
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::~wxDropSource()
@@ -728,6 +700,40 @@ wxDropSource::~wxDropSource()
g_blockEventsOnDrag = FALSE; g_blockEventsOnDrag = FALSE;
} }
void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
{
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_icon.GetMask()) mask = m_icon.GetMask()->GetBitmap();
GdkPixmap *pixmap = m_icon.GetPixmap();
gint width,height;
gdk_window_get_size (pixmap, &width, &height);
GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
gtk_widget_push_colormap (colormap);
m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
gtk_widget_pop_visual ();
gtk_widget_pop_colormap ();
gtk_widget_set_usize (m_iconWindow, width, height);
gtk_widget_realize (m_iconWindow);
gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
if (mask)
gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
}
wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{ {
wxASSERT_MSG( m_data, wxT("wxDragSource: no data") ); wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
@@ -783,21 +789,13 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{ {
GdkDragContext *context = gtk_drag_begin( m_widget, GdkDragContext *context = gtk_drag_begin( m_widget,
target_list, target_list,
GDK_ACTION_COPY, (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE),
button_number, /* number of mouse button which started drag */ button_number, /* number of mouse button which started drag */
(GdkEvent*) &event ); (GdkEvent*) &event );
wxMask *mask = m_goIcon.GetMask(); m_dragContext = context;
GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap(); PrepareIcon( 0, 0, context );
GdkPixmap *pm = m_goIcon.GetPixmap();
gtk_drag_set_icon_pixmap( context,
gtk_widget_get_colormap( m_widget ),
pm,
bm,
0,
0 );
while (m_waiting) gtk_main_iteration();; while (m_waiting) gtk_main_iteration();;
} }

144
src/gtk1/dnd.cpp
View File

@@ -54,47 +54,6 @@ extern bool g_blockEventsOnDrag;
// standard icons // 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 */ /* XPM */
static char * page_xpm[] = { static char * page_xpm[] = {
/* width height ncolors chars_per_pixel */ /* width height ncolors chars_per_pixel */
@@ -206,8 +165,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
if (ret) if (ret)
{ {
GdkDragAction action = GDK_ACTION_MOVE; GdkDragAction action = GDK_ACTION_MOVE;
if (result == wxDragCopy) action == GDK_ACTION_COPY; if (result == wxDragCopy) action = GDK_ACTION_COPY;
gdk_drag_status( context, context->suggested_action, time ); gdk_drag_status( context, action, time );
} }
/* after this, invalidate the drop_target's GdkDragContext */ /* after this, invalidate the drop_target's GdkDragContext */
@@ -678,49 +637,62 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget),
drop_source->m_waiting = FALSE; drop_source->m_waiting = FALSE;
} }
//-----------------------------------------------------------------------------
// "configure_event" from m_iconWindow
//-----------------------------------------------------------------------------
static gint
gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
{
if (g_isIdle)
wxapp_install_idle_handler();
wxDragResult action = wxDragNone;
if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy;
if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove;
source->GiveFeedback( action, FALSE );
return 0;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxDropSource // wxDropSource
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
{ {
g_blockEventsOnDrag = TRUE; g_blockEventsOnDrag = TRUE;
m_waiting = TRUE; m_waiting = TRUE;
m_iconWindow = (GtkWidget*) NULL;
m_window = win; m_window = win;
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragCancel;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_icon = icon;
m_goaheadCursor = wxCursor( wxCURSOR_HAND ); if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
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 &icon )
const wxIcon &go, const wxIcon &stop )
{ {
m_waiting = TRUE; m_waiting = TRUE;
SetData( data ); SetData( data );
m_iconWindow = (GtkWidget*) NULL;
m_window = win; m_window = win;
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragCancel;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); m_icon = icon;
m_goaheadCursor = wxCursor( wxCURSOR_HAND ); if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
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::~wxDropSource()
@@ -728,6 +700,40 @@ wxDropSource::~wxDropSource()
g_blockEventsOnDrag = FALSE; g_blockEventsOnDrag = FALSE;
} }
void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
{
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_icon.GetMask()) mask = m_icon.GetMask()->GetBitmap();
GdkPixmap *pixmap = m_icon.GetPixmap();
gint width,height;
gdk_window_get_size (pixmap, &width, &height);
GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
gtk_widget_push_colormap (colormap);
m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
gtk_widget_pop_visual ();
gtk_widget_pop_colormap ();
gtk_widget_set_usize (m_iconWindow, width, height);
gtk_widget_realize (m_iconWindow);
gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event",
GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this );
gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE);
if (mask)
gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0);
gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y );
}
wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{ {
wxASSERT_MSG( m_data, wxT("wxDragSource: no data") ); wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
@@ -783,21 +789,13 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{ {
GdkDragContext *context = gtk_drag_begin( m_widget, GdkDragContext *context = gtk_drag_begin( m_widget,
target_list, target_list,
GDK_ACTION_COPY, (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE),
button_number, /* number of mouse button which started drag */ button_number, /* number of mouse button which started drag */
(GdkEvent*) &event ); (GdkEvent*) &event );
wxMask *mask = m_goIcon.GetMask(); m_dragContext = context;
GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap(); PrepareIcon( 0, 0, context );
GdkPixmap *pm = m_goIcon.GetPixmap();
gtk_drag_set_icon_pixmap( context,
gtk_widget_get_colormap( m_widget ),
pm,
bm,
0,
0 );
while (m_waiting) gtk_main_iteration();; while (m_waiting) gtk_main_iteration();;
} }