new file added

[wxWidgets.git] / src / gtk / tglbtn.cpp

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 9b9d064259bdcbd96ea60e130a8889c25fbf0644..0589a9b70da967f717f5d568c34207a78cd80f6b 100644 (file)
--- 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
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter


@@ -7,221 +7,69 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/tglbtn.h"
-#include "wx/button.h"
-

 #if wxUSE_TOGGLEBTN
 
 #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
 
 #endif
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 
 extern bool      g_blockEventsOnDrag;
 #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)
 {
 
 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_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);
     // Generate a wx event.
     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)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );

 
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------

-// wxToggleBitmapButton
+// wxBitmapToggleButton

 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToggleBitmapButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton)

 
 

-bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
-                            const wxBitmap &label, const wxPoint &pos,
+bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
+                            const wxBitmap &bitmap, const wxPoint &pos,

                             const wxSize &size, long style,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             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"));
+    if ( !wxToggleButton::Create(parent, id, wxEmptyString, pos, size, style | wxBU_NOTEXT | wxBU_EXACTFIT,
+                                 validator, name) )

         return false;
         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 );
-
-    if (m_bitmap.Ok())
+    if ( bitmap.IsOk() )

     {
     {

-        OnSetBitmap();
-    }
+        SetBitmapLabel(bitmap);

 
 

-    g_signal_connect (m_widget, "clicked",
-                      G_CALLBACK (gtk_togglebutton_clicked_callback),
-                      this);
-
-    m_parent->DoAddChild(this);
-
-    PostCreation(size);
-
-    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"));
-
-    if (state == GetValue())
-        return;
-
-    m_blockEvent = true;
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
-
-    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"));
-
-    return GTK_TOGGLE_BUTTON(m_widget)->active;
-}
-
-void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
-{
-    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
-
-    m_bitmap = label;
-    InvalidateBestSize();
-
-    OnSetBitmap();
-}
-
-void wxToggleBitmapButton::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)
-    {
-        // initial bitmap
-        GtkWidget *pixmap = gtk_pixmap_new(m_bitmap.GetPixmap(), mask);
-        gtk_widget_show(pixmap);
-        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
-    }
-    else
-    {   // subsequent bitmaps
-        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(g_pixmap, m_bitmap.GetPixmap(), mask);
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);

     }
     }

-}
-
-bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
-{
-    if (!wxControl::Enable(enable))
-        return false;
-
-    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(GTK_BIN(m_widget)->child, style);
-}
-
-bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
-{
-    return window == 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 best;
-
-    if (m_bitmap.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bitmap.GetWidth()+border;
-        best.y = m_bitmap.GetHeight()+border;
-    }
-    CacheBestSize(best);
-    return best;
-}
-
-
-// static
-wxVisualAttributes
-wxToggleBitmapButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
-}
-

 
 // ------------------------------------------------------------------------
 // wxToggleButton
 
 // ------------------------------------------------------------------------
 // wxToggleButton


@@ -235,21 +83,35 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             const wxValidator& validator,
                             const wxString &name)
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-
-    m_blockEvent = false;
-

     if (!PreCreation(parent, pos, size) ||
     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;
     }
 
         wxFAIL_MSG(wxT("wxToggleButton creation failed"));
         return false;
     }
 

-    wxControl::SetLabel(label);
+    // 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();
+
+        GtkWidget *image = gtk_image_new();
+        gtk_widget_show(image);
+        gtk_container_add(GTK_CONTAINER(m_widget), image);
+    }
+
+    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);

 
     g_signal_connect (m_widget, "clicked",
                       G_CALLBACK (gtk_togglebutton_clicked_callback),
 
     g_signal_connect (m_widget, "clicked",
                       G_CALLBACK (gtk_togglebutton_clicked_callback),


@@ -262,6 +124,18 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+void wxToggleButton::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widget,
+                                (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+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)
 // void SetValue(bool state)
 // Set the value of the toggle button.
 void wxToggleButton::SetValue(bool state)


@@ -271,11 +145,11 @@ void wxToggleButton::SetValue(bool state)
     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
 }
 
 // bool GetValue() const


@@ -284,66 +158,69 @@ 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"));
 
 }
 
 void wxToggleButton::SetLabel(const wxString& label)
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 

-    wxControl::SetLabel(label);
-
-    gtk_label_set_text(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
-}
+    wxAnyButton::SetLabel(label);

 
 

-bool wxToggleButton::Enable(bool enable /*=true*/)
-{
-    if (!wxControl::Enable(enable))
-        return false;
+    if ( HasFlag(wxBU_NOTEXT) )
+    {
+        // Don't try to update the label for a button not showing it, this is
+        // unnecessary and can also actually replace the image we show with the
+        // label entirely breaking the button code, see #13693.
+        return;
+    }

 
 

-    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+    const wxString labelGTK = GTKConvertMnemonics(label);

 
 

-    return true;
-}
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));

 
 

-void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
-{
-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
+    GTKApplyWidgetStyle( false );

 }
 
 }
 

-bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
+#if wxUSE_MARKUP
+bool wxToggleButton::DoSetLabelMarkup(const wxString& markup)

 {
 {

-    return window == GTK_BUTTON(m_widget)->event_window;
-}
+    wxCHECK_MSG( m_widget != NULL, false, "invalid toggle button" );

 
 

-void wxToggleButton::OnInternalIdle()
-{
-    wxCursor cursor = m_cursor;
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )
+        return false;

 
 

-    if (g_globalCursor.Ok())
-        cursor = g_globalCursor;
+    wxControl::SetLabel(stripped);

 
 

-    GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
-    if ( win && cursor.Ok() )
+    if ( !HasFlag(wxBU_NOTEXT) )

     {
     {

-      /* 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. */
+        GtkLabel * const label = GTKGetLabel();
+        wxCHECK_MSG( label, false, "no label in this toggle button?" );

 
 

-        gdk_window_set_cursor(win, cursor.GetCursor());
+        GTKSetLabelWithMarkupForLabel(label, markup);

     }
 
     }
 

-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    return true;
+}
+#endif // wxUSE_MARKUP
+
+GtkLabel *wxToggleButton::GTKGetLabel() const
+{
+    GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
+    return GTK_LABEL(child);

 }
 
 }
 

+void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+}

 
 // Get the "best" size for this control.
 wxSize wxToggleButton::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 (!HasFlag(wxBU_EXACTFIT))
     {


@@ -362,4 +239,3 @@ wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_TOGGLEBTN
 }
 
 #endif // wxUSE_TOGGLEBTN

-