#if wxUSE_TOGGLEBTN
+// FIXME: Use GtkImage instead of GtkPixmap.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
#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;
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);
+ 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);
}
}
const wxValidator& validator,
const wxString &name)
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
-
- m_blockEvent = FALSE;
+ 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"));
- return FALSE;
+ return false;
}
-
+
m_bitmap = label;
// Create the gtk widget.
OnSetBitmap();
}
- gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
- GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
- (gpointer *)this);
+ g_signal_connect (m_widget, "clicked",
+ G_CALLBACK (gtk_togglebutton_clicked_callback),
+ this);
m_parent->DoAddChild(this);
PostCreation(size);
- return TRUE;
+ return true;
}
// void SetValue(bool state)
// Set the value of the toggle button.
void wxToggleBitmapButton::SetValue(bool state)
{
- wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+ wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
- if (state == GetValue())
- return;
+ if (state == GetValue())
+ return;
- m_blockEvent = TRUE;
+ m_blockEvent = true;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = FALSE;
+ m_blockEvent = false;
}
// bool GetValue() const
// Get the value of the toggle button.
bool wxToggleBitmapButton::GetValue() const
{
- wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+ wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
- return GTK_TOGGLE_BUTTON(m_widget)->active;
+ return GTK_TOGGLE_BUTTON(m_widget)->active;
}
void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
m_bitmap = label;
InvalidateBestSize();
-
+
OnSetBitmap();
}
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
- GtkWidget *child = BUTTON_CHILD(m_widget);
+ GtkWidget *child = GTK_BIN(m_widget)->child;
if (child == NULL)
{
// initial bitmap
}
}
-bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
{
if (!wxControl::Enable(enable))
- return FALSE;
+ return false;
- gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
- return TRUE;
+ return true;
}
void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
- gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+ gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
{
- return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ return window == GTK_BUTTON(m_widget)->event_window;
}
void wxToggleBitmapButton::OnInternalIdle()
{
wxCursor cursor = m_cursor;
-
+
if (g_globalCursor.Ok())
cursor = g_globalCursor;
- GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
if ( win && cursor.Ok() )
{
/* I now set the cursor the anew in every OnInternalIdle call
wxSize wxToggleBitmapButton::DoGetBestSize() const
{
wxSize best;
-
+
if (m_bitmap.Ok())
{
int border = HasFlag(wxNO_BORDER) ? 4 : 10;
const wxValidator& validator,
const wxString &name)
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
-
- m_blockEvent = FALSE;
+ m_needParent = true;
+ m_acceptsFocus = true;
- if (!PreCreation(parent, pos, size) ||
- !CreateBase(parent, id, pos, size, style, validator, name )) {
- wxFAIL_MSG(wxT("wxToggleButton creation failed"));
- return FALSE;
- }
+ m_blockEvent = false;
- wxControl::SetLabel(label);
+ if (!PreCreation(parent, pos, size) ||
+ !CreateBase(parent, id, pos, size, style, validator, name )) {
+ wxFAIL_MSG(wxT("wxToggleButton creation failed"));
+ return false;
+ }
- // Create the gtk widget.
- m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+ wxControl::SetLabel(label);
- gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
- GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
- (gpointer *)this);
+ // Create the gtk widget.
+ m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
- m_parent->DoAddChild(this);
+ g_signal_connect (m_widget, "clicked",
+ G_CALLBACK (gtk_togglebutton_clicked_callback),
+ this);
+
+ m_parent->DoAddChild(this);
- PostCreation(size);
+ PostCreation(size);
- return TRUE;
+ return true;
}
// void SetValue(bool state)
// Set the value of the toggle button.
void wxToggleButton::SetValue(bool state)
{
- wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+ wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
- if (state == GetValue())
- return;
+ if (state == GetValue())
+ return;
- m_blockEvent = TRUE;
+ m_blockEvent = true;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = FALSE;
+ m_blockEvent = false;
}
// bool GetValue() const
// Get the value of the toggle button.
bool wxToggleButton::GetValue() const
{
- wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+ wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
- return GTK_TOGGLE_BUTTON(m_widget)->active;
+ return GTK_TOGGLE_BUTTON(m_widget)->active;
}
void wxToggleButton::SetLabel(const wxString& label)
wxControl::SetLabel(label);
- gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
+ gtk_label_set_text(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
}
-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleButton::Enable(bool enable /*=true*/)
{
if (!wxControl::Enable(enable))
- return FALSE;
+ return false;
- gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
- return TRUE;
+ return true;
}
void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
- gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+ gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
{
- return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ return window == GTK_BUTTON(m_widget)->event_window;
}
void wxToggleButton::OnInternalIdle()
{
wxCursor cursor = m_cursor;
-
+
if (g_globalCursor.Ok())
cursor = g_globalCursor;
- GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
+ GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
if ( win && cursor.Ok() )
{
/* I now set the cursor the anew in every OnInternalIdle call
wxSize wxToggleButton::DoGetBestSize() const
{
wxSize ret(wxControl::DoGetBestSize());
-
+
if (!HasFlag(wxBU_EXACTFIT))
{
if (ret.x < 80) ret.x = 80;
}
-
+
CacheBestSize(ret);
return ret;
}
projects / wxWidgets.git / blobdiff