/////////////////////////////////////////////////////////////////////////////
-// Name: checkbox.cpp
+// Name: src/gtk1/checkbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
// idle system
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
-extern wxCursor g_globalCursor;
+extern bool g_blockEventsOnDrag;
+extern wxCursor g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
//-----------------------------------------------------------------------------
// "clicked"
//-----------------------------------------------------------------------------
-static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
+extern "C" {
+static void gtk_checkbox_toggled_callback(GtkWidget *WXUNUSED(widget),
+ wxCheckBox *cb)
{
if (g_isIdle) wxapp_install_idle_handler();
if (!cb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
-
+
if (cb->m_blockEvent) return;
- wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
- event.SetInt( cb->GetValue() );
+ wxCommandEvent event(wxEVT_CHECKBOX, cb->GetId());
+ event.SetInt(cb->GetValue());
event.SetEventObject(cb);
- cb->GetEventHandler()->ProcessEvent(event);
+ cb->HandleWindowEvent(event);
+}
}
//-----------------------------------------------------------------------------
// wxCheckBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
-
wxCheckBox::wxCheckBox()
{
}
const wxValidator& validator,
const wxString &name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
- m_blockEvent = FALSE;
+ 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;
}
- wxControl::SetLabel( label );
-
if ( style & wxALIGN_RIGHT )
{
// VZ: as I don't know a way to create a right aligned checkbox with
// left of it
m_widgetCheckbox = gtk_check_button_new();
- m_widgetLabel = gtk_label_new(m_label.mbc_str());
+ m_widgetLabel = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
m_widget = gtk_hbox_new(FALSE, 0);
}
else
{
- m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() );
+ m_widgetCheckbox = gtk_check_button_new_with_label("");
m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
m_widget = m_widgetCheckbox;
}
+ SetLabel( label );
gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
- "clicked",
- GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
+ "toggled",
+ GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback),
(gpointer *)this );
m_parent->DoAddChild( this );
- PostCreation();
-
- SetFont( parent->GetFont() );
-
- 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 );
+ PostCreation(size);
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
-
- Show( TRUE );
-
- return TRUE;
+ return true;
}
void wxCheckBox::SetValue( bool state )
if (state == GetValue())
return;
- m_blockEvent = TRUE;
+ m_blockEvent = true;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
- m_blockEvent = FALSE;
+ m_blockEvent = false;
}
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(m_widgetCheckbox)->active;
}
{
wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
- wxControl::SetLabel( label );
-
- gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() );
+ GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);
}
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
- return FALSE;
+ return false;
gtk_widget_set_sensitive( m_widgetLabel, enable );
- return TRUE;
+ return true;
}
-void wxCheckBox::ApplyWidgetStyle()
+void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle );
- gtk_widget_set_style( m_widgetLabel, m_widgetStyle );
+ gtk_widget_modify_style(m_widgetCheckbox, style);
+ gtk_widget_modify_style(m_widgetLabel, style);
}
bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window )
void wxCheckBox::OnInternalIdle()
{
wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
+ if (g_globalCursor.IsOk()) cursor = g_globalCursor;
GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox);
- if ( event_window && cursor.Ok() )
+ if ( event_window && cursor.IsOk() )
{
/* I now set the cursor the anew in every OnInternalIdle call
as setting the cursor in a parent window also effects the
gdk_window_set_cursor( event_window, cursor.GetCursor() );
}
- UpdateWindowUI();
+ 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);
}
wxSize wxCheckBox::DoGetBestSize() const
return wxControl::DoGetBestSize();
}
+// static
+wxVisualAttributes
+wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_check_button_new);
+}
+
#endif
projects / wxWidgets.git / blobdiff