/////////////////////////////////////////////////////////////////////////////
-// Name: checkbox.cpp
+// Name: src/gtk/checkbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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 <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
-extern wxCursor g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;
//-----------------------------------------------------------------------------
// "clicked"
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;
-
// Transitions for 3state checkbox must be done manually, GTK's checkbox
// is 2state with additional "undetermined state" flag which isn't
// changed automatically:
{
// 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->m_blockEvent = true;
+ cb->GTKDisableEvents();
if (!active && !inconsistent)
{
}
else
{
- wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
+ wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!"));
}
- cb->m_blockEvent = false;
+ cb->GTKEnableEvents();
}
else
{
}
}
- wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
+ wxCommandEvent event(wxEVT_CHECKBOX, cb->GetId());
event.SetInt(cb->Get3StateValue());
event.SetEventObject(cb);
- cb->GetEventHandler()->ProcessEvent(event);
+ cb->HandleWindowEvent(event);
}
}
// wxCheckBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
-
wxCheckBox::wxCheckBox()
{
+ m_widgetCheckbox = NULL;
+}
+
+wxCheckBox::~wxCheckBox()
+{
+ if (m_widgetCheckbox && m_widgetCheckbox != m_widget)
+ GTKDisconnect(m_widgetCheckbox);
}
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
m_widgetLabel = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
- m_widget = gtk_hbox_new(FALSE, 0);
+ m_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
gtk_box_pack_start(GTK_BOX(m_widget), m_widgetCheckbox, FALSE, FALSE, 3);
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 );
g_signal_connect (m_widgetCheckbox, "toggled",
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 )
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") );
- return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
+ return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0;
}
void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
{
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
wxVisualAttributes
wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+ return GetDefaultAttributesFromGTKWidget(gtk_check_button_new());
}
#endif
projects / wxWidgets.git / blobdiff