ignore clicks on a toolbar but outside any button

[wxWidgets.git] / src / gtk / radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index d96aff1a1d099c852379498aafaf74a091a9887e..594cf793f8be79983a956f5f53588bef5fa8c888 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -11,15 +11,20 @@
 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

-#include "wx/radiobox.h"
+#include "wx/defs.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"

+#include "wx/log.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------


@@ -33,26 +38,20 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 

-static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
+static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!rb->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    if (rb->m_alreadySent)
-    {
-        rb->m_alreadySent = FALSE;
-        return;
-    }
-
-    rb->m_alreadySent = TRUE;
+    if (!button->active) return;

 
     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );
 
     wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
     event.SetInt( rb->GetSelection() );


@@ -61,14 +60,111 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
     rb->GetEventHandler()->ProcessEvent(event);
 }
 
     rb->GetEventHandler()->ProcessEvent(event);
 }
 

+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!rb->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    if ((gdk_event->keyval != GDK_Up) &&
+        (gdk_event->keyval != GDK_Down) &&
+        (gdk_event->keyval != GDK_Left) &&
+        (gdk_event->keyval != GDK_Right))
+    {
+        return FALSE;
+    }
+
+    wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
+    if (!node)
+    {
+        return FALSE;
+    }
+
+    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+
+    if ((gdk_event->keyval == GDK_Up) ||
+        (gdk_event->keyval == GDK_Left))
+    {
+        if (node == rb->m_boxes.First())
+            node = rb->m_boxes.Last();
+        else
+            node = node->Previous();
+    }
+    else
+    {
+        if (node == rb->m_boxes.Last())
+            node = rb->m_boxes.First();
+        else
+            node = node->Next();
+    }
+
+    GtkWidget *button = (GtkWidget*) node->Data();
+
+    gtk_widget_grab_focus( button );
+
+    return TRUE;
+}
+
+static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+                                      GdkEvent *WXUNUSED(event),
+                                      wxRadioBox *win )
+{
+    if ( win->m_lostFocus )
+    {
+        // no, we didn't really lose it
+        win->m_lostFocus = FALSE;
+    }
+    else if ( !win->m_hasFocus )
+    {
+        win->m_hasFocus = TRUE;
+
+        wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
+        event.SetEventObject( win );
+
+        // never stop the signal emission, it seems to break the kbd handling
+        // inside the radiobox
+        (void)win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    return FALSE;
+}
+
+static gint gtk_radiobutton_focus_out( GtkWidget *widget,
+                                       GdkEvent *WXUNUSED(event),
+                                       wxRadioBox *win )
+{
+  //    wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+  // Replace with a warning, else we dump core a lot!
+  //  if (!win->m_hasFocus)
+  //      wxLogWarning(_T("Radiobox got focus out without any focus in.") );
+
+    // we might have lost the focus, but may be not - it may have just gone to
+    // another button in the same radiobox, so we'll check for it in the next
+    // idle iteration (leave m_hasFocus == TRUE for now)
+    win->m_lostFocus = TRUE;
+
+    return FALSE;
+}
+

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 

-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()

 {
 {

+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+
+    m_hasFocus =
+    m_lostFocus = FALSE;

 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,


@@ -77,20 +173,18 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          long style, const wxValidator& validator,
                          const wxString &name )
 {
                          long style, const wxValidator& validator,
                          const wxString &name )
 {

-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioBox creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxRadioBox creation failed") );

-       return FALSE;
+        return FALSE;

     }
 
     m_widget = gtk_frame_new( title.mbc_str() );
 
     }
 
     m_widget = gtk_frame_new( title.mbc_str() );
 

-    m_majorDim = majorDim;
+    // majorDim may be 0 if all trailing parameters were omitted, so don't
+    // assert here but just use the correct value for it
+    m_majorDim = majorDim == 0 ? n : majorDim;

 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 


@@ -110,6 +204,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
         m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
 
 
         m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
 

+        gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
+           GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+

         m_boxes.Append( (wxObject*) m_radio );
 
         ConnectWidget( GTK_WIDGET(m_radio) );
         m_boxes.Append( (wxObject*) m_radio );
 
         ConnectWidget( GTK_WIDGET(m_radio) );


@@ -117,29 +214,44 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
         if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
         if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
 
         gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",

-           GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );

 
 

-        gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
+        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event",
+            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this );
+
+        gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event",
+            GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
+
+        gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow),

                          GTK_WIDGET(m_radio),
                          m_x+10, m_y+10+(i*24), 10, 10 );
     }
 
                          GTK_WIDGET(m_radio),
                          m_x+10, m_y+10+(i*24), 10, 10 );
     }
 

+    m_parent->DoAddChild( this );
+
+    PostCreation();
+
+    ApplyWidgetStyle();
+
+    SetLabel( title );
+
+    SetFont( parent->GetFont() );
+

     wxSize ls = LayoutItems();
 
     wxSize ls = LayoutItems();
 

+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
+    if (req.width > ls.x) ls.x = req.width;
+

     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );
 
     wxSize newSize = size;
     if (newSize.x == -1) newSize.x = ls.x;
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );
 

-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    SetLabel( title );
-

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -160,7 +272,7 @@ wxRadioBox::~wxRadioBox()
 void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );

-    
+

     LayoutItems();
 }
 
     LayoutItems();
 }
 


@@ -193,7 +305,7 @@ wxSize wxRadioBox::LayoutItems()
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }

-       
+

     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {


@@ -206,13 +318,17 @@ wxSize wxRadioBox::LayoutItems()
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );

-                GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
-                GdkFont *font = m_widget->style->font;
-                int len = 22+gdk_string_measure( font, label->label );
-                if (len > max_len) max_len = len;

 
 

-                gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-                y += 22;
+                GtkRequisition req;
+                req.width = 2;
+                req.height = 2;
+                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
+                      (button, &req );
+
+                if (req.width > max_len) max_len = req.width;
+
+                gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+                y += req.height;

 
                 node = node->Next();
                 if (!node) break;
 
                 node = node->Next();
                 if (!node) break;


@@ -225,7 +341,7 @@ wxSize wxRadioBox::LayoutItems()
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
 
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
 

-                gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );
+                gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );

 
                 node = node->Next();
                 if (!node) break;
 
                 node = node->Next();
                 if (!node) break;


@@ -237,7 +353,7 @@ wxSize wxRadioBox::LayoutItems()
         }
 
         res.x = x+4;
         }
 
         res.x = x+4;

-        res.y += 9;
+        res.y += 4;

     }
     else
     {
     }
     else
     {


@@ -246,12 +362,15 @@ wxSize wxRadioBox::LayoutItems()
         wxNode *node = m_boxes.First();
         while (node)
         {
         wxNode *node = m_boxes.First();
         while (node)
         {

-            GtkButton *button = GTK_BUTTON( node->Data() );
-            GtkLabel *label = GTK_LABEL( button->child );
+            GtkWidget *button = GTK_WIDGET( node->Data() );
+
+            GtkRequisition req;
+            req.width = 2;
+            req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
+                  (button, &req );

 
 

-            GdkFont *font = m_widget->style->font;
-            int len = 22+gdk_string_measure( font, label->label );
-            if (len > max) max = len;
+            if (req.width > max) max = req.width;

 
             node = node->Next();
         }
 
             node = node->Next();
         }


@@ -261,7 +380,7 @@ wxSize wxRadioBox::LayoutItems()
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );
 
         {
             GtkWidget *button = GTK_WIDGET( node->Data() );
 

-            gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
+            gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );

             x += max;
 
             node = node->Next();
             x += max;
 
             node = node->Next();


@@ -277,7 +396,11 @@ bool wxRadioBox::Show( bool show )
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
 

-    wxWindow::Show( show );
+    if (!wxControl::Show(show))
+    {
+        // nothing to do
+        return FALSE;
+    }

 
     if ((m_windowStyle & wxNO_BORDER) != 0)
         gtk_widget_hide( m_widget );
 
     if ((m_windowStyle & wxNO_BORDER) != 0)
         gtk_widget_hide( m_widget );


@@ -329,7 +452,6 @@ void wxRadioBox::SetFocus()
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );
         if (button->active)
         {
             gtk_widget_grab_focus( GTK_WIDGET(button) );

-

             return;
         }
         node = node->Next();
             return;
         }
         node = node->Next();


@@ -347,11 +469,11 @@ void wxRadioBox::SetSelection( int n )
 
     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
 
 
     GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
 

-    DisableEvents();
-    
-    gtk_toggle_button_set_state( button, 1 );
-    
-    EnableEvents();
+    GtkDisableEvents();
+
+    gtk_toggle_button_set_active( button, 1 );
+
+    GtkEnableEvents();

 }
 
 int wxRadioBox::GetSelection(void) const
 }
 
 int wxRadioBox::GetSelection(void) const


@@ -388,13 +510,6 @@ wxString wxRadioBox::GetString( int n ) const
     return wxString( label->label );
 }
 
     return wxString( label->label );
 }
 

-wxString wxRadioBox::GetLabel( int item ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
-
-    return GetString( item );
-}
-

 void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 void wxRadioBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );


@@ -404,7 +519,7 @@ void wxRadioBox::SetLabel( const wxString& label )
     gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
 }
 
     gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
 }
 

-void wxRadioBox::SetLabel( int item, const wxString& label )
+void wxRadioBox::SetString( int item, const wxString& label )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
 


@@ -418,11 +533,6 @@ void wxRadioBox::SetLabel( int item, const wxString& label )
     gtk_label_set( g_label, label.mbc_str() );
 }
 
     gtk_label_set( g_label, label.mbc_str() );
 }
 

-void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
-{
-    wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
-}
-

 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 bool wxRadioBox::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )


@@ -502,7 +612,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
     return TRUE;
 }
 
     return TRUE;
 }
 

-int wxRadioBox::Number() const
+int wxRadioBox::GetCount() const

 {
     return m_boxes.Number();
 }
 {
     return m_boxes.Number();
 }


@@ -517,7 +627,7 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
     wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
 }
 
     wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
 }
 

-void wxRadioBox::DisableEvents()
+void wxRadioBox::GtkDisableEvents()

 {
     wxNode *node = m_boxes.First();
     while (node)
 {
     wxNode *node = m_boxes.First();
     while (node)


@@ -525,11 +635,11 @@ void wxRadioBox::DisableEvents()
         gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

-       node = node->Next();
+        node = node->Next();

     }
 }
 
     }
 }
 

-void wxRadioBox::EnableEvents()
+void wxRadioBox::GtkEnableEvents()

 {
     wxNode *node = m_boxes.First();
     while (node)
 {
     wxNode *node = m_boxes.First();
     while (node)


@@ -537,7 +647,7 @@ void wxRadioBox::EnableEvents()
         gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 
         gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
            GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
 

-       node = node->Next();
+        node = node->Next();

     }
 }
 
     }
 }
 


@@ -560,6 +670,19 @@ void wxRadioBox::ApplyWidgetStyle()
     }
 }
 
     }
 }
 

+#if wxUSE_TOOLTIPS
+void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+{
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+        GtkWidget *widget = GTK_WIDGET( node->Data() );
+        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+        node = node->Next();
+    }
+}
+#endif // wxUSE_TOOLTIPS
+

 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     if (window == m_widget->window) return TRUE;
 bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
     if (window == m_widget->window) return TRUE;


@@ -577,4 +700,19 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
     return FALSE;
 }
 
     return FALSE;
 }
 

-#endif
+void wxRadioBox::OnInternalIdle()
+{
+    if ( m_lostFocus )
+    {
+        m_hasFocus = FALSE;
+        m_lostFocus = FALSE;
+
+        wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
+        event.SetEventObject( this );
+
+        (void)GetEventHandler()->ProcessEvent( event );
+    }
+}
+
+#endif // wxUSE_RADIOBOX
+