/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/tglbtn.cpp
+// Name: src/gtk/tglbtn.cpp
// Purpose: Definition of the wxToggleButton class, which implements a
// toggle button under wxGTK.
// Author: John Norris, minor changes by Axel Schlueter
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/tglbtn.h"
-#include "wx/button.h"
-
#if wxUSE_TOGGLEBTN
-// FIXME: Use GtkImage instead of GtkPixmap.
-#include <gtk/gtkversion.h>
-#ifdef GTK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
+#include "wx/tglbtn.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/button.h"
#endif
#include "wx/gtk/private.h"
extern bool g_blockEventsOnDrag;
-extern wxCursor g_globalCursor;
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;
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)
// ------------------------------------------------------------------------
-// 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;
}
- m_bitmap = label;
-
// Create the gtk widget.
m_widget = gtk_toggle_button_new();
if (style & wxNO_BORDER)
- gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
+ gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
- if (m_bitmap.Ok())
- {
- OnSetBitmap();
- }
+ m_bitmap = label;
+ OnSetBitmap();
g_signal_connect (m_widget, "clicked",
G_CALLBACK (gtk_togglebutton_clicked_callback),
// 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"));
// 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(m_widget)->active;
+ 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;
- GdkBitmap *mask = (GdkBitmap *) NULL;
- if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-
- GtkWidget *child = GTK_BIN(m_widget)->child;
- if (child == NULL)
+ GtkWidget* image = ((GtkBin*)m_widget)->child;
+ if (image == NULL)
{
// initial bitmap
- GtkWidget *pixmap = gtk_pixmap_new(m_bitmap.GetPixmap(), mask);
- gtk_widget_show(pixmap);
- gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
+ image = gtk_image_new_from_pixbuf(m_bitmap.GetPixbuf());
+ gtk_widget_show(image);
+ gtk_container_add((GtkContainer*)m_widget, image);
}
else
{ // subsequent bitmaps
- GtkPixmap *g_pixmap = GTK_PIXMAP(child);
- gtk_pixmap_set(g_pixmap, m_bitmap.GetPixmap(), mask);
+ gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());
}
}
-bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
+bool wxBitmapToggleButton::Enable(bool enable /*=true*/)
{
if (!wxControl::Enable(enable))
return false;
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);
}
-bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
+GdkWindow *
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- return window == GTK_BUTTON(m_widget)->event_window;
+ return GTK_BUTTON(m_widget)->event_window;
}
-void wxToggleBitmapButton::OnInternalIdle()
-{
- wxCursor cursor = m_cursor;
-
- if (g_globalCursor.Ok())
- cursor = g_globalCursor;
-
- GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
- 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(win, cursor.GetCursor());
- }
-
- if (wxUpdateUIEvent::CanUpdate(this))
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-
// 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 )) {
+ !CreateBase(parent, id, pos, size, style, validator, name ))
+ {
wxFAIL_MSG(wxT("wxToggleButton creation failed"));
return false;
}
- wxControl::SetLabel(label);
-
// Create the gtk widget.
- m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+ m_widget = gtk_toggle_button_new_with_mnemonic("");
+
+ SetLabel(label);
g_signal_connect (m_widget, "clicked",
G_CALLBACK (gtk_togglebutton_clicked_callback),
wxControl::SetLabel(label);
- gtk_label_set_text(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
+ const wxString labelGTK = GTKConvertMnemonics(label);
+
+ gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
+
+ ApplyWidgetStyle( false );
}
bool wxToggleButton::Enable(bool enable /*=true*/)
gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
-bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
+GdkWindow *
+wxToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- return window == GTK_BUTTON(m_widget)->event_window;
+ return GTK_BUTTON(m_widget)->event_window;
}
-void wxToggleButton::OnInternalIdle()
-{
- wxCursor cursor = m_cursor;
-
- if (g_globalCursor.Ok())
- cursor = g_globalCursor;
-
- GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
- 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(win, cursor.GetCursor());
- }
-
- if (wxUpdateUIEvent::CanUpdate(this))
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-
// Get the "best" size for this control.
wxSize wxToggleButton::DoGetBestSize() const
{
}
#endif // wxUSE_TOGGLEBTN
-
projects / wxWidgets.git / blobdiff