X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7ac4461ab64212a536a8dabffc2ad65ef573a5f..484523cf522b02385cd47c432d50d117940b46b9:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 8c4fbbfaf9..8bc24ddf9e 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -14,14 +14,24 @@ #include "wx/checkbox.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#if wxUSE_CHECKBOX + +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "clicked" @@ -29,13 +39,9 @@ extern bool g_blockEventsOnDrag; static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb ) { - if (!cb->HasVMT()) return; + if (g_isIdle) wxapp_install_idle_handler(); - if (cb->m_blockFirstEvent) - { - cb->m_blockFirstEvent = FALSE; - return; - } + if (!cb->m_hasVMT) return; if (g_blockEventsOnDrag) return; @@ -51,46 +57,77 @@ 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; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxCheckBox creation failed") ); + return FALSE; + } - SetValidator( validator ); + wxControl::SetLabel( label ); - m_widget = gtk_check_button_new_with_label( m_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_blockFirstEvent = FALSE; + m_widgetLabel = gtk_label_new(m_label.mbc_str()); + gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); - 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 ); + 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_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), (gpointer*)this ); + 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; + } - m_parent->AddChild( this ); + gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), + "clicked", + GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), + (gpointer *)this ); - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); - gtk_widget_realize( GTK_BUTTON( m_widget )->child ); + SetFont( parent->GetFont() ); - SetLabel( label ); + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -99,48 +136,82 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label void wxCheckBox::SetValue( bool state ) { - wxCHECK_RET( m_widget != NULL, "invalid checkbox" ); + wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") ); - if ( state == GetValue() ) + if (state == GetValue()) return; - // for compatibility with wxMSW don't send notification when the check box - // state is changed programmatically - m_blockFirstEvent = TRUE; + 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_widget), state ); + 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 { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid checkbox" ); + wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") ); - return GTK_TOGGLE_BUTTON(m_widget)->active; + return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; } void wxCheckBox::SetLabel( const wxString& label ) { - wxCHECK_RET( m_widget != NULL, "invalid checkbox" ); + wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") ); wxControl::SetLabel( label ); - gtk_label_set( GTK_LABEL( GTK_BUTTON(m_widget)->child ), GetLabel() ); + gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() ); } -void wxCheckBox::Enable( bool enable ) +bool wxCheckBox::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid checkbox" ); + if ( !wxControl::Enable( enable ) ) + return FALSE; - wxControl::Enable( enable ); + gtk_widget_set_sensitive( m_widgetLabel, enable ); - gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + return TRUE; } void wxCheckBox::ApplyWidgetStyle() { SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); + gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle ); + gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); +} + +bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) +{ + return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window); } +void wxCheckBox::OnInternalIdle() +{ + wxCursor cursor = m_cursor; + if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->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( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() ); + } + + UpdateWindowUI(); +} + +wxSize wxCheckBox::DoGetBestSize() const +{ + return wxControl::DoGetBestSize(); +} + +#endif