X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84eb0838423075d768a425ab8a0d49d28735c05..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/checkbox.cpp?ds=inline diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index c4aac9364a..af1d2592c3 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -2,10 +2,9 @@ // Name: checkbox.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,6 +14,18 @@ #include "wx/checkbox.h" +#if wxUSE_CHECKBOX + +#include "gdk/gdk.h" +#include "gtk/gtk.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -27,13 +38,16 @@ extern bool g_blockEventsOnDrag; static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb ) { - if (!cb->HasVMT()) return; - if (g_blockEventsOnDrag) return; - - wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); - event.SetInt( cb->GetValue() ); - event.SetEventObject(cb); - cb->GetEventHandler()->ProcessEvent(event); + if (g_isIdle) wxapp_install_idle_handler(); + + if (!cb->m_hasVMT) return; + + if (g_blockEventsOnDrag) return; + + wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); + event.SetInt( cb->GetValue() ); + event.SetEventObject(cb); + cb->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- @@ -42,92 +56,134 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) -wxCheckBox::wxCheckBox(void) +wxCheckBox::wxCheckBox() { } -bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos, const wxSize &size, - long style, const wxValidator& validator, const wxString &name ) +bool wxCheckBox::Create(wxWindow *parent, + wxWindowID id, + const wxString &label, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { - m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); - - m_widget = gtk_check_button_new_with_label( m_label ); - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 25+gdk_string_measure( m_widget->style->font, label ); - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this ); - - PostCreation(); - - SetLabel( label ); - - Show( TRUE ); - - return TRUE; + m_needParent = TRUE; + m_acceptsFocus = TRUE; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( _T("wxCheckBox creation failed") ); + return FALSE; + } + + wxControl::SetLabel( label ); + + if ( style & wxALIGN_RIGHT ) + { + // VZ: as I don't know a way to create a right aligned checkbox with + // GTK we will create a checkbox without label and a label at the + // left of it + m_widgetCheckbox = gtk_check_button_new(); + + m_widgetLabel = gtk_label_new(m_label.mbc_str()); + gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); + + m_widget = gtk_hbox_new(FALSE, 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); + + gtk_widget_show( m_widgetLabel ); + gtk_widget_show( m_widgetCheckbox ); + } + else + { + m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() ); + m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child; + m_widget = m_widgetCheckbox; + } + + wxSize newSize(size); + if (newSize.x == -1) + { + newSize.x = 25 + gdk_string_measure( m_widgetCheckbox->style->font, + m_label.mbc_str() ); + } + if (newSize.y == -1) + newSize.y = 26; + + SetSize( newSize.x, newSize.y ); + + gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), + "clicked", + GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), + (gpointer *)this ); + + m_parent->DoAddChild( this ); + + PostCreation(); + + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); + + Show( TRUE ); + + return TRUE; } void wxCheckBox::SetValue( bool state ) { - if (state) - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_ACTIVE ); - else - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), GTK_STATE_NORMAL ); + wxCHECK_RET( m_widgetCheckbox != NULL, _T("invalid checkbox") ); + + if (state == GetValue()) + return; + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox), + GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), + (gpointer *)this ); + + gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); + + gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), + "clicked", + GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), + (gpointer *)this ); } bool wxCheckBox::GetValue() const { - GtkToggleButton *tb = GTK_TOGGLE_BUTTON(m_widget); - return tb->active; + wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, _T("invalid checkbox") ); + + return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; } void wxCheckBox::SetLabel( const wxString& label ) { - wxControl::SetLabel( label ); - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkLabel *g_label = GTK_LABEL( bin->child ); - gtk_label_set( g_label, GetLabel() ); + wxCHECK_RET( m_widgetLabel != NULL, _T("invalid checkbox") ); + + wxControl::SetLabel( label ); + + gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() ); } -void wxCheckBox::Enable( bool enable ) +bool wxCheckBox::Enable( bool enable ) { - wxControl::Enable( enable ); - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkWidget *label = bin->child; - gtk_widget_set_sensitive( label, enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; + + gtk_widget_set_sensitive( m_widgetLabel, enable ); + + return TRUE; } -void wxCheckBox::SetFont( const wxFont &font ) +void wxCheckBox::ApplyWidgetStyle() { - if (((wxFont*)&font)->Ok()) - m_font = font; - else - m_font = *wxSWISS_FONT; - - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkWidget *label = bin->child; - - GtkStyle *style = (GtkStyle*) NULL; - if (!m_hasOwnStyle) - { - m_hasOwnStyle = TRUE; - style = gtk_style_copy( gtk_widget_get_style( label ) ); - } - else - { - style = gtk_widget_get_style( label ); - } - - gdk_font_unref( style->font ); - style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); - - gtk_widget_set_style( label, style ); + SetWidgetStyle(); + gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle ); + gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); } + +#endif