extern "C" {
static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
if (!cb->m_hasVMT || g_blockEventsOnDrag)
return;
- if (cb->m_blockEvent) return;
-
// Generate a wx event.
wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
event.SetInt(cb->GetValue());
event.SetEventObject(cb);
- cb->GetEventHandler()->ProcessEvent(event);
+ cb->HandleWindowEvent(event);
}
}
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
// ------------------------------------------------------------------------
-// wxToggleBitmapButton
+// wxBitmapToggleButton
// ------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToggleBitmapButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl)
-bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
+bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap &label, const wxPoint &pos,
const wxSize &size, long style,
const wxValidator& validator,
const wxString &name)
{
- m_needParent = true;
- m_acceptsFocus = true;
-
- m_blockEvent = false;
-
if (!PreCreation(parent, pos, size) ||
!CreateBase(parent, id, pos, size, style, validator, name ))
{
- wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
+ wxFAIL_MSG(wxT("wxBitmapToggleButton creation failed"));
return false;
}
// Create the gtk widget.
m_widget = gtk_toggle_button_new();
+ g_object_ref(m_widget);
if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
return true;
}
+void wxBitmapToggleButton::GTKDisableEvents()
+{
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+void wxBitmapToggleButton::GTKEnableEvents()
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
// void SetValue(bool state)
// Set the value of the toggle button.
-void wxToggleBitmapButton::SetValue(bool state)
+void wxBitmapToggleButton::SetValue(bool state)
{
wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
if (state == GetValue())
return;
- m_blockEvent = true;
+ GTKDisableEvents();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = false;
+ GTKEnableEvents();
}
// bool GetValue() const
// Get the value of the toggle button.
-bool wxToggleBitmapButton::GetValue() const
+bool wxBitmapToggleButton::GetValue() const
{
wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
return gtk_toggle_button_get_active((GtkToggleButton*)m_widget);
}
-void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
+void wxBitmapToggleButton::SetLabel(const wxBitmap& label)
{
wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
OnSetBitmap();
}
-void wxToggleBitmapButton::OnSetBitmap()
+void wxBitmapToggleButton::OnSetBitmap()
{
if (!m_bitmap.Ok()) return;
GtkWidget* image = ((GtkBin*)m_widget)->child;
if (image == NULL)
{
- // initial bitmap
- image = gtk_image_new_from_pixbuf(m_bitmap.GetPixbuf());
+ image = gtk_image_new();
gtk_widget_show(image);
gtk_container_add((GtkContainer*)m_widget, image);
}
- else
- { // subsequent bitmaps
- gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());
- }
+ // always use pixbuf, because pixmap mask does not
+ // work with disabled images in some themes
+ gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());
}
-bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
+bool wxBitmapToggleButton::Enable(bool enable /*=true*/)
{
+ bool isEnabled = IsEnabled();
+
if (!wxControl::Enable(enable))
return false;
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+ if (!isEnabled && enable)
+ {
+ GTKFixSensitivity();
+ }
+
return true;
}
-void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
+void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
GdkWindow *
-wxToggleBitmapButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
return GTK_BUTTON(m_widget)->event_window;
}
// Get the "best" size for this control.
-wxSize wxToggleBitmapButton::DoGetBestSize() const
+wxSize wxBitmapToggleButton::DoGetBestSize() const
{
wxSize best;
// static
wxVisualAttributes
-wxToggleBitmapButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+wxBitmapToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
}
const wxValidator& validator,
const wxString &name)
{
- m_needParent = true;
- m_acceptsFocus = true;
-
- m_blockEvent = false;
-
if (!PreCreation(parent, pos, size) ||
!CreateBase(parent, id, pos, size, style, validator, name ))
{
// Create the gtk widget.
m_widget = gtk_toggle_button_new_with_mnemonic("");
+ g_object_ref(m_widget);
SetLabel(label);
return true;
}
+void wxToggleButton::GTKDisableEvents()
+{
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+void wxToggleButton::GTKEnableEvents()
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
// void SetValue(bool state)
// Set the value of the toggle button.
void wxToggleButton::SetValue(bool state)
if (state == GetValue())
return;
- m_blockEvent = true;
+ GTKDisableEvents();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = false;
+ GTKEnableEvents();
}
// bool GetValue() const
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
- ApplyWidgetStyle( false );
+ GTKApplyWidgetStyle( false );
}
bool wxToggleButton::Enable(bool enable /*=true*/)
{
- if (!wxControl::Enable(enable))
+ if (!base_type::Enable(enable))
return false;
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+ if (enable)
+ GTKFixSensitivity();
+
return true;
}
projects / wxWidgets.git / blobdiff