X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8e24dfa9322702d56a125586a7d4a37f4a5dfd7..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/gtk/tglbtn.cpp diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp index d6f4d5881f..4886ce1fcc 100644 --- a/src/gtk/tglbtn.cpp +++ b/src/gtk/tglbtn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 @@ -7,44 +7,74 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2000 Johnny C. Norris II -// License: Rocketeer license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_TOGGLEBTN + #include "wx/tglbtn.h" -#include "wx/button.h" -#if wxUSE_TOGGLEBTN +#ifndef WX_PRECOMP + #include "wx/button.h" +#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 (!cb->m_hasVMT || g_blockEventsOnDrag) + return; + + // Generate a wx event. + wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId()); + event.SetInt(cb->GetValue()); + event.SetEventObject(cb); + cb->HandleWindowEvent(event); +} +} + +wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); + +// ------------------------------------------------------------------------ +// wxBitmapToggleButton +// ------------------------------------------------------------------------ + +IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton) + +bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id, + const wxBitmap &bitmap, const wxPoint &pos, + const wxSize &size, long style, + const wxValidator& validator, + const wxString &name) +{ + if ( !wxToggleButton::Create(parent, id, wxEmptyString, pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT, + validator, name) ) + return false; + + if ( bitmap.IsOk() ) + { + SetBitmapLabel(bitmap); + + // we need to adjust the size after setting the bitmap as it may be too + // big for the default button size + SetInitialSize(size); + } + + return true; } + +// ------------------------------------------------------------------------ +// wxToggleButton +// ------------------------------------------------------------------------ + IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED) bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, const wxString &label, const wxPoint &pos, @@ -52,137 +82,148 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id, 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("wxToggleButton creation failed")); + return false; + } + + // create either a standard toggle button with text label (which may still contain + // an image under GTK+ 2.6+) or a bitmap-only toggle button if we don't have any + // label + const bool + useLabel = !(style & wxBU_NOTEXT) && !label.empty(); + if ( useLabel ) + { + m_widget = gtk_toggle_button_new_with_mnemonic(""); + } + else // no label, suppose we will have a bitmap + { + m_widget = gtk_toggle_button_new(); - if (!PreCreation(parent, pos, size) || - !CreateBase(parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG(wxT("wxToggleButton creation failed")); - return FALSE; - } + GtkWidget *image = gtk_image_new(); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(m_widget), image); + } - wxControl::SetLabel(label); + g_object_ref(m_widget); - // Create the gtk widget. - m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) ); + if ( useLabel ) + SetLabel(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); + m_parent->DoAddChild(this); - PostCreation(); - InheritAttributes(); + PostCreation(size); - wxSize size_best(DoGetBestSize()); - wxSize new_size(size); - if (new_size.x == -1) - new_size.x = size_best.x; - if (new_size.y == -1) - new_size.y = size_best.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize(new_size.x, new_size.y); + return true; +} - Show(TRUE); +void wxToggleButton::GTKDisableEvents() +{ + g_signal_handlers_block_by_func(m_widget, + (gpointer) gtk_togglebutton_clicked_callback, this); +} - return TRUE; +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) { - 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; + GTKDisableEvents(); - 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; + GTKEnableEvents(); } // 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_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0; } void wxToggleButton::SetLabel(const wxString& label) { wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button")); - wxControl::SetLabel(label); + wxAnyButton::SetLabel(label); + + const wxString labelGTK = GTKConvertMnemonics(label); - gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) ); + gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK)); + + GTKApplyWidgetStyle( false ); } -bool wxToggleButton::Enable(bool enable /*=TRUE*/) +#if wxUSE_MARKUP +bool wxToggleButton::DoSetLabelMarkup(const wxString& markup) { - if (!wxControl::Enable(enable)) - return FALSE; + wxCHECK_MSG( m_widget != NULL, false, "invalid toggle button" ); - gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable); + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) + return false; - return TRUE; -} + wxControl::SetLabel(stripped); -void wxToggleButton::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style(m_widget, m_widgetStyle); - gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle); + GtkLabel * const label = GTKGetLabel(); + wxCHECK_MSG( label, false, "no label in this toggle button?" ); + + GTKSetLabelWithMarkupForLabel(label, markup); + + return true; } +#endif // wxUSE_MARKUP -bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window) +GtkLabel *wxToggleButton::GTKGetLabel() const { - return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); + GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget)); + return GTK_LABEL(child); } -void wxToggleButton::OnInternalIdle() +void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style) { - 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(win, cursor.GetCursor()); - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); + gtk_widget_modify_style(m_widget, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } -// wxSize DoGetBestSize() const // Get the "best" size for this control. wxSize wxToggleButton::DoGetBestSize() const { - wxSize ret(wxControl::DoGetBestSize()); - + wxSize ret(wxAnyButton::DoGetBestSize()); + if (!HasFlag(wxBU_EXACTFIT)) { if (ret.x < 80) ret.x = 80; } - - return ret; + CacheBestSize(ret); + return ret; } -#endif // wxUSE_TOGGLEBTN +// static +wxVisualAttributes +wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new); +} +#endif // wxUSE_TOGGLEBTN