Nuke GTK1 from src/gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -506,13 +506,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
|
||||
GList *child = m_dragContext->targets;
|
||||
while (child)
|
||||
{
|
||||
// in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer
|
||||
GdkAtom formatAtom =
|
||||
#ifdef __WXGTK20__
|
||||
(GdkAtom)(child->data);
|
||||
#else
|
||||
GPOINTER_TO_INT(child->data);
|
||||
#endif
|
||||
GdkAtom formatAtom = (GdkAtom)(child->data);
|
||||
wxDataFormat format( formatAtom );
|
||||
|
||||
#ifdef __WXDEBUG__
|
||||
@@ -823,18 +817,12 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
|
||||
gdk_window_get_size (pixmap, &width, &height);
|
||||
|
||||
GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
|
||||
#ifndef __WXGTK20__
|
||||
gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
|
||||
#endif
|
||||
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);
|
||||
|
||||
#ifndef __WXGTK20__
|
||||
gtk_widget_pop_visual ();
|
||||
#endif
|
||||
gtk_widget_pop_colormap ();
|
||||
|
||||
gtk_widget_set_usize (m_iconWindow, width, height);
|
||||
|
Reference in New Issue
Block a user