#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;
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);
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
if (!wxControl::Enable(enable))
return false;
- gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
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()
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
// Create the gtk widget.
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),
- (gpointer *)this);
+ g_signal_connect (m_widget, "clicked",
+ G_CALLBACK (gtk_togglebutton_clicked_callback),
+ this);
m_parent->DoAddChild(this);
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*/)
if (!wxControl::Enable(enable))
return false;
- gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
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()
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