projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings about conversion to bool, closes #14381
[wxWidgets.git]
/
src
/
gtk
/
popupwin.cpp
diff --git
a/src/gtk/popupwin.cpp
b/src/gtk/popupwin.cpp
index 38ac3c14f41c9bfa58fa965360f63e38fdeb0424..17d0671e937373cb02059039715c29f8c35cab67 100644
(file)
--- a/
src/gtk/popupwin.cpp
+++ b/
src/gtk/popupwin.cpp
@@
-46,7
+46,7
@@
static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
{
if (child == widget)
return FALSE;
{
if (child == widget)
return FALSE;
- child =
child->parent
;
+ child =
gtk_widget_get_parent(child)
;
}
}
}
}
@@
-73,14
+73,6
@@
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
}
}
}
}
-void wxPopupWindow::AddChildGTK(wxWindowGTK* child)
-{
- gtk_widget_set_size_request(
- child->m_widget, child->m_width, child->m_height);
- gtk_fixed_put(
- GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y);
-}
-
//-----------------------------------------------------------------------------
// wxPopupWindow
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxPopupWindow
//-----------------------------------------------------------------------------
@@
-114,12
+106,17
@@
bool wxPopupWindow::Create( wxWindow *parent, int style )
g_object_ref( m_widget );
gtk_widget_set_name( m_widget, "wxPopupWindow" );
g_object_ref( m_widget );
gtk_widget_set_name( m_widget, "wxPopupWindow" );
- gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
+ // wxPopupWindow is used for different windows as well
+ // gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget );
if (GTK_IS_WINDOW (toplevel))
{
GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget );
if (GTK_IS_WINDOW (toplevel))
{
- gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
+#if GTK_CHECK_VERSION(2,10,0)
+ if (!gtk_check_version(2,10,0))
+ gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
+#endif
+
gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
}
gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
}
gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
@@
-205,7
+202,7
@@
void wxPopupWindow::SetFocus()
return;
}
}
return;
}
}
-
+
wxPopupWindowBase::SetFocus();
}
wxPopupWindowBase::SetFocus();
}