// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checkbox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/checkbox.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
// idle system
// "clicked"
//-----------------------------------------------------------------------------
-static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
+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;
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId());
- event.SetInt( cb->GetValue() );
+ event.SetInt(cb->GetValue());
event.SetEventObject(cb);
cb->GetEventHandler()->ProcessEvent(event);
}
+}
//-----------------------------------------------------------------------------
// wxCheckBox
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
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 );
{
wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") );
- wxControl::SetLabel( label );
-
-#ifdef __WXGTK20__
- wxString label2 = PrepareLabelMnemonics( label );
- gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) );
-#else
- gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );
-#endif
+ GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label);
}
bool wxCheckBox::Enable( bool enable )
g_delayedFocus = NULL;
}
}
-
+
if (wxUpdateUIEvent::CanUpdate(this))
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}