X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 8b561f3929..b19cacc6d3 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: checkbox.cpp +// Name: src/gtk/checkbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,28 +10,18 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_CHECKBOX #include "wx/checkbox.h" -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -40,15 +30,8 @@ extern wxWindowGTK *g_delayedFocus; extern "C" { static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!cb->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - - if (cb->m_blockEvent) return; -#ifdef __WXGTK20__ // Transitions for 3state checkbox must be done manually, GTK's checkbox // is 2state with additional "undetermined state" flag which isn't // changed automatically: @@ -60,11 +43,11 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) { // The 3 states cycle like this when clicked: // checked -> undetermined -> unchecked -> checked -> ... - bool active = gtk_toggle_button_get_active(toggle); - bool inconsistent = gtk_toggle_button_get_inconsistent(toggle); + bool active = gtk_toggle_button_get_active(toggle) != 0; + bool inconsistent = gtk_toggle_button_get_inconsistent(toggle) != 0; + + cb->GTKDisableEvents(); - cb->m_blockEvent = true; - if (!active && !inconsistent) { // checked -> undetermined @@ -83,10 +66,10 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) } else { - wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!")); + wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!")); } - - cb->m_blockEvent = false; + + cb->GTKEnableEvents(); } else { @@ -94,16 +77,11 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) gtk_toggle_button_set_inconsistent(toggle, false); } } -#endif wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); -#ifdef __WXGTK20__ event.SetInt(cb->Get3StateValue()); -#else - event.SetInt(cb->GetValue()); -#endif event.SetEventObject(cb); - cb->GetEventHandler()->ProcessEvent(event); + cb->HandleWindowEvent(event); } } @@ -111,8 +89,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) // wxCheckBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) - wxCheckBox::wxCheckBox() { } @@ -126,22 +102,14 @@ bool wxCheckBox::Create(wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_blockEvent = FALSE; - + WXValidateStyle( &style ); if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxCheckBox creation failed") ); - return FALSE; + return false; } - wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 || - (style & wxCHK_3STATE) != 0, - wxT("Using wxCHK_ALLOW_3RD_STATE_FOR_USER") - wxT(" style flag for a 2-state checkbox is useless") ); - if ( style & wxALIGN_RIGHT ) { // VZ: as I don't know a way to create a right aligned checkbox with @@ -162,21 +130,32 @@ bool wxCheckBox::Create(wxWindow *parent, else { m_widgetCheckbox = gtk_check_button_new_with_label(""); - m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox ); + m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox)); m_widget = m_widgetCheckbox; } + g_object_ref(m_widget); SetLabel( label ); - gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "toggled", - GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback), - (gpointer *)this ); + g_signal_connect (m_widgetCheckbox, "toggled", + G_CALLBACK (gtk_checkbox_toggled_callback), this); m_parent->DoAddChild( this ); PostCreation(size); - return TRUE; + return true; +} + +void wxCheckBox::GTKDisableEvents() +{ + g_signal_handlers_block_by_func(m_widgetCheckbox, + (gpointer) gtk_checkbox_toggled_callback, this); +} + +void wxCheckBox::GTKEnableEvents() +{ + g_signal_handlers_unblock_by_func(m_widgetCheckbox, + (gpointer) gtk_checkbox_toggled_callback, this); } void wxCheckBox::SetValue( bool state ) @@ -186,25 +165,20 @@ void wxCheckBox::SetValue( bool state ) if (state == GetValue()) return; - m_blockEvent = TRUE; + GTKDisableEvents(); - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); - m_blockEvent = FALSE; + GTKEnableEvents(); } bool wxCheckBox::GetValue() const { - wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") ); + wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") ); -#ifdef __WXGTK20__ - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)); -#else - return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; -#endif + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0; } -#ifdef __WXGTK20__ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) { SetValue(state != wxCHK_UNCHECKED); @@ -223,68 +197,39 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED; } } -#endif void wxCheckBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") ); + // save the label inside m_label in case user calls GetLabel() later + wxControl::SetLabel(label); + GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label); } bool wxCheckBox::Enable( bool enable ) { - if ( !wxControl::Enable( enable ) ) - return FALSE; + if (!base_type::Enable(enable)) + return false; gtk_widget_set_sensitive( m_widgetLabel, enable ); - return TRUE; -} - -void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widgetCheckbox, style); - gtk_widget_modify_style(m_widgetLabel, style); -} + if (enable) + GTKFixSensitivity(); -bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) -{ - return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); + return true; } -void wxCheckBox::OnInternalIdle() +void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) { - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox); - if ( event_window && cursor.Ok() ) - { - /* I now set the cursor the anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ - - gdk_window_set_cursor( event_window, cursor.GetCursor() ); - } - - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); + GTKApplyStyle(m_widgetCheckbox, style); + GTKApplyStyle(m_widgetLabel, style); } -wxSize wxCheckBox::DoGetBestSize() const +GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return wxControl::DoGetBestSize(); + return gtk_button_get_event_window(GTK_BUTTON(m_widgetCheckbox)); } // static