speeding up rectangle drawing by using specific methods, needs 40% less time

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 7bccf53080fb67ad46a0bf5b2313c654c80ee2f8..52b95ba1fe59f2d7e69a4b0d9c86dde146d454ce 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,210 +7,191 @@
 // 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:     Rocketeer license
+// 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"
 

+#if wxUSE_TOGGLEBTN
+

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

-#include "wx/button.h"

 
 

-#if wxUSE_TOGGLEBTN
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;

 extern bool      g_blockEventsOnDrag;
 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)
 {
 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);
+}

 }
 
 }
 

-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, 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)
 {
                             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 ))
     {
     if (!PreCreation(parent, pos, size) ||
        !CreateBase(parent, id, pos, size, style, validator, name ))
     {

-        wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
-        return FALSE;
+        wxFAIL_MSG(wxT("wxBitmapToggleButton creation failed"));
+        return false;

     }
     }

-    
-    m_bitmap = label;

 
     // Create the gtk widget.
     m_widget = gtk_toggle_button_new();
 
     // Create the gtk widget.
     m_widget = gtk_toggle_button_new();

+    g_object_ref(m_widget);

 
     if (style & wxNO_BORDER)
 
     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();

 
 

-    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);
 
 
     m_parent->DoAddChild(this);
 
     PostCreation(size);
 

-    return TRUE;
+    return true;
+}
+
+void wxBitmapToggleButton::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widget,
+                                (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+void wxBitmapToggleButton::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 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"));
+    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 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"));
+    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"));
 
     m_bitmap = label;
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 
     m_bitmap = label;

-    
+    InvalidateBestSize();
+

     OnSetBitmap();
 }
 
     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();
+    if (!m_bitmap.IsOk()) return;

 
 

-    GtkWidget *child = BUTTON_CHILD(m_widget);
-    if (child == NULL)
+    GtkWidget* image = gtk_bin_get_child(GTK_BIN(m_widget));
+    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);
-    }
-    else
-    {   // subsequent bitmaps
-        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(g_pixmap, m_bitmap.GetPixmap(), mask);
+        image = gtk_image_new();
+        gtk_widget_show(image);
+        gtk_container_add((GtkContainer*)m_widget, image);

     }
     }

+    // always use pixbuf, because pixmap mask does not
+    // work with disabled images in some themes
+    gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());

 }
 
 }
 

-bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
+bool wxBitmapToggleButton::Enable(bool enable /*=true*/)

 {
 {

+    bool isEnabled = IsEnabled();
+

     if (!wxControl::Enable(enable))
     if (!wxControl::Enable(enable))

-        return FALSE;
+        return false;

 
 

-    gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);

 
 

-    return TRUE;
-}
+    if (!isEnabled && enable)
+    {
+        GTKFixSensitivity();
+    }

 
 

-void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
-{
-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+    return true;

 }
 
 }
 

-bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
+void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);

 }
 
 }
 

-void wxToggleBitmapButton::OnInternalIdle()
+GdkWindow *
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    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);
+    return GTK_BUTTON(m_widget)->event_window;

 }
 
 }
 

-// wxSize DoGetBestSize() const

 // Get the "best" size for this control.
 // Get the "best" size for this control.

-wxSize wxToggleBitmapButton::DoGetBestSize() const
+wxSize wxBitmapToggleButton::DoGetBestSize() const

 {
     wxSize best;
 {
     wxSize best;

-    
-    if (m_bitmap.Ok())
+
+    if (m_bitmap.IsOk())

     {
         int border = HasFlag(wxNO_BORDER) ? 4 : 10;
         best.x = m_bitmap.GetWidth()+border;
         best.y = m_bitmap.GetHeight()+border;
     }
     {
         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
     return best;
 }
 
 
 // static
 wxVisualAttributes

-wxToggleBitmapButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+wxBitmapToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
     return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
 }
 {
     return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
 }


@@ -228,56 +209,65 @@ 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) ||
+        !CreateBase(parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG(wxT("wxToggleButton creation failed"));
+        return false;
+    }

 
 

-   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_mnemonic("");
+    g_object_ref(m_widget);

 
 

-   wxControl::SetLabel(label);
+    SetLabel(label);

 
 

-   // Create the gtk widget.
-   m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+    g_signal_connect (m_widget, "clicked",
+                      G_CALLBACK (gtk_togglebutton_clicked_callback),
+                      this);

 
 

-   gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
-                      GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
-                      (gpointer *)this);
+    m_parent->DoAddChild(this);

 
 

-   m_parent->DoAddChild(this);
+    PostCreation(size);

 
 

-   PostCreation(size);
+    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)
 {

-   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
 {
 }
 
 // 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)
 }
 
 void wxToggleButton::SetLabel(const wxString& label)


@@ -286,67 +276,50 @@ void wxToggleButton::SetLabel(const wxString& label)
 
     wxControl::SetLabel(label);
 
 
     wxControl::SetLabel(label);
 

-    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
+    const wxString labelGTK = GTKConvertMnemonics(label);
+
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));

 
 

-    PostSetLabel();
+    GTKApplyWidgetStyle( false );

 }
 
 }
 

-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleButton::Enable(bool enable /*=true*/)

 {
 {

-    if (!wxControl::Enable(enable))
-        return FALSE;
+    if (!base_type::Enable(enable))
+        return false;
+
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);

 
 

-    gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
+    if (enable)
+        GTKFixSensitivity();

 
 

-    return TRUE;
+    return true;

 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);

-    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
-}
-
-bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
-{
-    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);

 }
 
 }
 

-void wxToggleButton::OnInternalIdle()
+GdkWindow *
+wxToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    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);
+    return GTK_BUTTON(m_widget)->event_window;

 }
 
 }
 

-// wxSize DoGetBestSize() const

 // Get the "best" size for this control.
 wxSize wxToggleButton::DoGetBestSize() const
 {
     wxSize ret(wxControl::DoGetBestSize());
 // Get the "best" size for this control.
 wxSize wxToggleButton::DoGetBestSize() const
 {
     wxSize ret(wxControl::DoGetBestSize());

-   
+

     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;
     }
     if (!HasFlag(wxBU_EXACTFIT))
     {
         if (ret.x < 80) ret.x = 80;
     }

-    

 
 

-   return ret;
+    CacheBestSize(ret);
+    return ret;

 }
 
 // static
 }
 
 // static


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

-