#include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h>
-#include "wx/gtk/win_gtk.h"
-
//-----------------------------------------------------------------------------
// wxGTKRadioButtonInfo
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST( wxRadioBoxButtonsInfoList );
+WX_DEFINE_LIST( wxRadioBoxButtonsInfoList )
extern bool g_blockEventsOnDrag;
extern "C" {
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;
event.SetInt( rb->GetSelection() );
event.SetString( rb->GetStringSelection() );
event.SetEventObject( rb );
- rb->GetEventHandler()->ProcessEvent(event);
+ rb->HandleWindowEvent(event);
}
}
extern "C" {
static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
{
- // don't need to install idle handler, its done from "event" signal
-
if (!rb->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
// CTRL-TAB changes the (parent) window, i.e. switch notebook page
new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
new_event.SetCurrentFocus( rb );
- return rb->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+ return rb->GetParent()->HandleWindowEvent(new_event);
}
if ((gdk_event->keyval != GDK_Up) &&
return FALSE;
}
- g_signal_stop_emission_by_name (widget, "key_press_event");
-
if ((gdk_event->keyval == GDK_Up) ||
(gdk_event->keyval == GDK_Left))
{
}
extern "C" {
-static gint gtk_radiobutton_focus_in( GtkWidget *widget,
- GdkEvent *WXUNUSED(event),
- wxRadioBox *win )
+static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget),
+ GdkEventFocus *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 );
- }
+ // NB: This control is composed of several GtkRadioButton widgets and
+ // when focus changes from one of them to another in the same
+ // wxRadioBox, we get a focus-out event followed by focus-in for
+ // another GtkRadioButton owned by the same control. We don't want
+ // to generate two spurious wxEVT_SET_FOCUS events in this case,
+ // so we defer sending wx events until idle time.
+ win->GTKHandleFocusOut();
+ // never stop the signal emission, it seems to break the kbd handling
+ // inside the radiobox
return FALSE;
}
}
extern "C" {
-static gint gtk_radiobutton_focus_out( GtkWidget *widget,
- GdkEvent *WXUNUSED(event),
- wxRadioBox *win )
+static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget),
+ GdkEventFocus *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;
+ win->GTKHandleFocusIn();
+ // never stop the signal emission, it seems to break the kbd handling
+ // inside the radiobox
return FALSE;
}
}
GtkAllocation * alloc,
wxRadioBox *win )
{
- unsigned int n = 0;
for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst();
node;
- node = node->GetNext(), n++ )
+ node = node->GetNext())
{
- if( widget == GTK_WIDGET(node->GetData()->button) )
+ if (widget == GTK_WIDGET(node->GetData()->button))
{
const wxPoint origin = win->GetPosition();
wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y,
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
-void wxRadioBox::Init()
-{
- m_needParent = true;
- m_acceptsFocus = true;
-
- m_hasFocus =
- m_lostFocus = false;
-}
-
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint &pos, const wxSize &size,
m_widget = GTKCreateFrame(title);
wxControl::SetLabel(title);
+ if ( HasFlag(wxNO_BORDER) )
+ {
+ // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+ gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+ }
+
// majorDim may be 0 if all trailing parameters were omitted, so don't
// assert here but just use the correct value for it
radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(rbtn) );
label.Empty();
- for ( const wxChar *pc = choices[i]; *pc; pc++ )
+ for ( wxString::const_iterator pc = choices[i].begin();
+ pc != choices[i].end(); ++pc )
{
if ( *pc != wxT('&') )
label += *pc;
return true;
}
-void wxRadioBox::SetFocus()
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
-
- if (m_buttonsInfo.GetCount() == 0) return;
-
- wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
- while (node)
- {
- GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button );
- if (button->active)
- {
- gtk_widget_grab_focus( GTK_WIDGET(button) );
- return;
- }
- node = node->GetNext();
- }
-}
-
void wxRadioBox::SetSelection( int n )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
while (node)
{
- g_signal_handlers_disconnect_by_func (node->GetData()->button,
- (gpointer) gtk_radiobutton_clicked_callback,
- this);
+ g_signal_handlers_block_by_func(node->GetData()->button,
+ (gpointer)gtk_radiobutton_clicked_callback, this);
node = node->GetNext();
}
wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
while (node)
{
- g_signal_connect (node->GetData()->button, "clicked",
- G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+ g_signal_handlers_unblock_by_func(node->GetData()->button,
+ (gpointer)gtk_radiobutton_clicked_callback, this);
node = node->GetNext();
}
}
#if wxUSE_TOOLTIPS
-void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip)
+void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip)
{
// set this tooltip for all radiobuttons which don't have their own tips
unsigned n = 0;
{
if ( !GetItemToolTip(n) )
{
- wxToolTip::Apply(GTK_WIDGET(node->GetData()->button),
- wxConvCurrent->cWX2MB(tip));
+ wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip);
}
}
}
return NULL;
}
-void wxRadioBox::OnInternalIdle()
-{
- wxControl::OnInternalIdle();
-
- if ( m_lostFocus )
- {
- m_hasFocus = false;
- m_lostFocus = false;
-
- wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
- event.SetEventObject( this );
-
- (void)GetEventHandler()->ProcessEvent( event );
- }
-}
-
// static
wxVisualAttributes
wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
for ( wxRadioBoxButtonsInfoList::compatibility_iterator
node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ )
{
- if ( m_buttonsInfo[n]->rect.Inside(pt) )
+ if ( m_buttonsInfo[n]->rect.Contains(pt) )
return n;
}
projects / wxWidgets.git / blobdiff