X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324dbfec39cc030027830a100239cb9a4e6624e8..e9158f7d8b2538bcca2b7e546a39ced77d3ddc4e:/src/gtk1/window.cpp diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 85c6fd6c76..7e01371333 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1799,6 +1799,7 @@ void wxWindow::Init() m_insertCallback = (wxInsertChildFunction) NULL; m_isStaticBox = FALSE; + m_isRadioButton = FALSE; m_acceptsFocus = FALSE; } @@ -2213,6 +2214,8 @@ void wxWindow::OnInternalIdle() if (cursor.Ok() && m_currentGdkCursor != cursor) { + m_currentGdkCursor = cursor; + if (m_wxwindow) { GdkWindow *window = m_wxwindow->window; @@ -2232,8 +2235,6 @@ void wxWindow::OnInternalIdle() if (window) gdk_window_set_cursor( window, cursor.GetCursor() ); } - - m_currentGdkCursor = cursor; } UpdateWindowUI(); @@ -2869,7 +2870,7 @@ static void pop_pos_callback( GtkMenu * WXUNUSED(menu), *y = gs_pop_y; } -bool wxWindow::PopupMenu( wxMenu *menu, int x, int y ) +bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) { wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );