Next take at radioboxes

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 85c6fd6c76df0627c5fb50345c79644625b1f2bf..7e01371333a7d3f8727315aaf1aae07574853a10 100644 (file)
--- 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_insertCallback = (wxInsertChildFunction) NULL;
 
     m_isStaticBox = FALSE;

+    m_isRadioButton = FALSE;

     m_acceptsFocus = FALSE;
 }
 
     m_acceptsFocus = FALSE;
 }
 


@@ -2213,6 +2214,8 @@ void wxWindow::OnInternalIdle()
 
     if (cursor.Ok() && m_currentGdkCursor != cursor)
     {
 
     if (cursor.Ok() && m_currentGdkCursor != cursor)
     {

+        m_currentGdkCursor = cursor;
+       

         if (m_wxwindow)
         {
             GdkWindow *window = m_wxwindow->window;
         if (m_wxwindow)
         {
             GdkWindow *window = m_wxwindow->window;


@@ -2232,8 +2235,6 @@ void wxWindow::OnInternalIdle()
             if (window)
                gdk_window_set_cursor( window, cursor.GetCursor() );
         }
             if (window)
                gdk_window_set_cursor( window, cursor.GetCursor() );
         }

-
-        m_currentGdkCursor = cursor;

     }
 
     UpdateWindowUI();
     }
 
     UpdateWindowUI();


@@ -2869,7 +2870,7 @@ static void pop_pos_callback( GtkMenu * WXUNUSED(menu),
     *y = gs_pop_y;
 }
 
     *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") );
 
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );