/////////////////////////////////////////////////////////////////////////////
#include "wx/tglbtn.h"
+#include "wx/button.h"
#if wxUSE_TOGGLEBTN
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
-// void gtk_togglebutton_clicked_callback(GtkWidget *widget, wxToggleButton *cb)
-// Callback function given to gtk.
-void wxToggleButton::gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
+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());
IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
-// bool Create(wxWindow *parent, wxWindowID id, const wxString &label,
-// const wxPoint &pos, const wxSize &size, long style,
-// const wxValidator& validator, const wxString &name)
-// Create the control.
bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
const wxString &label, const wxPoint &pos,
const wxSize &size, long style,
{
m_needParent = TRUE;
m_acceptsFocus = TRUE;
+
+ m_blockEvent = FALSE;
if (!PreCreation(parent, pos, size) ||
!CreateBase(parent, id, pos, size, style, validator, name )) {
wxControl::SetLabel(label);
// Create the gtk widget.
- m_widget = gtk_toggle_button_new_with_label(m_label.mbc_str());
+ m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
if (state == GetValue())
return;
- gtk_signal_disconnect_by_func(GTK_OBJECT(m_widget),
- GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
- (gpointer *)this);
+ m_blockEvent = TRUE;
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(m_widget), state);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
- GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
- (gpointer *)this);
+ m_blockEvent = FALSE;
}
// bool GetValue() const
return GTK_TOGGLE_BUTTON(m_widget)->active;
}
-// void SetLabel(const wxString& label)
-// Set the button's label.
void wxToggleButton::SetLabel(const wxString& label)
{
- wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+ wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
- wxControl::SetLabel(label);
+ wxControl::SetLabel(label);
- gtk_label_set(GTK_LABEL(GTK_BUTTON(m_widget)->child),
- GetLabel().mbc_str());
+ gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
}
-// bool Enable(bool enable)
-// Enable (or disable) the control.
bool wxToggleButton::Enable(bool enable /*=TRUE*/)
{
- if (!wxControl::Enable(enable))
- return FALSE;
+ if (!wxControl::Enable(enable))
+ return FALSE;
- gtk_widget_set_sensitive(GTK_BUTTON(m_widget)->child, enable);
+ gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
- return TRUE;
+ return TRUE;
}
-// void ApplyWidgetStyle()
-// I don't really know what this does.
void wxToggleButton::ApplyWidgetStyle()
{
- SetWidgetStyle();
- gtk_widget_set_style(m_widget, m_widgetStyle);
- gtk_widget_set_style(GTK_BUTTON(m_widget)->child, m_widgetStyle);
+ SetWidgetStyle();
+ gtk_widget_set_style(m_widget, m_widgetStyle);
+ gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle);
}
-// bool IsOwnGtkWindow(GdkWindow *window)
-// I'm not really sure what this is for, either.
bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
{
- return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+ return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
}
-// void OnInternalIdle()
-// Apparently gtk cursors are difficult to deal with.
void wxToggleButton::OnInternalIdle()
{
- wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok())
- cursor = g_globalCursor;
-
- if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok()) {
+ wxCursor cursor = m_cursor;
+
+ if (g_globalCursor.Ok())
+ cursor = g_globalCursor;
+
+ GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ if ( win && 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_widget)->event_window,
- cursor.GetCursor());
- }
+ gdk_window_set_cursor(win, cursor.GetCursor());
+ }
- UpdateWindowUI();
+ UpdateWindowUI();
}
// wxSize DoGetBestSize() const
// Get the "best" size for this control.
wxSize wxToggleButton::DoGetBestSize() const
{
- wxSize ret(wxControl::DoGetBestSize());
- if (ret.x < 80)
- ret.x = 80;
+ wxSize ret(wxControl::DoGetBestSize());
+
+ if (!HasFlag(wxBU_EXACTFIT))
+ {
+ if (ret.x < 80) ret.x = 80;
+ }
+
return ret;
}