X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7b2e4941fdf9842e17d2d375474e0846d0a1abe..c7c6e54baed01937426239dd38164ee0326fa172:/src/gtk/popupwin.cpp diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 0889be36d3..8d1a10b4f9 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -301,18 +301,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag m_resizing = false; } -void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) +void wxPopupWindow::GtkOnSize() { - // due to a bug in gtk, x,y are always 0 - // m_x = x; - // m_y = y; - - if ((m_height == height) && (m_width == width) && (m_sizeSet)) return; + if (m_sizeSet) return; if (!m_wxwindow) return; - m_width = width; - m_height = height; - /* FIXME: is this a hack? */ /* Since for some reason GTK will revert to using maximum size ever set for this window, we have to set geometry hints maxsize to match size @@ -342,7 +335,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int void wxPopupWindow::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) - GtkOnSize( m_x, m_y, m_width, m_height ); + GtkOnSize(); wxWindow::OnInternalIdle(); } @@ -356,7 +349,7 @@ bool wxPopupWindow::Show( bool show ) much ugly flicker nor from within the size_allocate handler, because GTK 1.1.X forbids that. */ - GtkOnSize( m_x, m_y, m_width, m_height ); + GtkOnSize(); } bool ret = wxWindow::Show( show );