Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index d6f4d5881f7c6d62c47c16231e0b73e1f7168b7c..26f10619975af95e2a0b66ea81b59246d2a7c2b9 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,182 +7,316 @@
 // 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
+// License:     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);
+}

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 

-bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
-                            const wxString &label, const wxPoint &pos,
+// ------------------------------------------------------------------------
+// wxBitmapToggleButton
+// ------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl)
+
+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 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("wxBitmapToggleButton 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();
+    g_object_ref(m_widget);

 
 

-   wxControl::SetLabel(label);
+    if (style & wxNO_BORDER)
+        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );

 
 

-   // Create the gtk widget.
-   m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+    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);
+    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 wxBitmapToggleButton::GTKDisableEvents()
+{
+    g_signal_handlers_block_by_func(m_widget,
+                                (gpointer) gtk_togglebutton_clicked_callback, this);
+}

 
 

-   return TRUE;
+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 wxToggleButton::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 wxToggleButton::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 wxToggleButton::SetLabel(const wxString& label)
+void wxBitmapToggleButton::SetLabel(const wxBitmap& label)

 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 

-    wxControl::SetLabel(label);
+    m_bitmap = label;
+    InvalidateBestSize();

 
 

-    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
+    OnSetBitmap();

 }
 
 }
 

-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+void wxBitmapToggleButton::OnSetBitmap()
+{
+    if (!m_bitmap.Ok()) return;
+
+    GtkWidget* image = ((GtkBin*)m_widget)->child;
+    if (image == NULL)
+    {
+        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 wxBitmapToggleButton::Enable(bool enable /*=true*/)

 {
     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(m_widget)->child, enable);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxToggleButton::ApplyWidgetStyle()
+void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style(m_widget, m_widgetStyle);
-    gtk_widget_set_style(BUTTON_CHILD(m_widget), m_widgetStyle);
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);

 }
 
 }
 

-bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
+GdkWindow *
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    return window == TOGGLE_BUTTON_EVENT_WIN(m_widget);
+    return GTK_BUTTON(m_widget)->event_window;

 }
 
 }
 

-void wxToggleButton::OnInternalIdle()
+// Get the "best" size for this control.
+wxSize wxBitmapToggleButton::DoGetBestSize() const

 {
 {

-    wxCursor cursor = m_cursor;
-    
-    if (g_globalCursor.Ok())
-        cursor = g_globalCursor;
+    wxSize best;

 
 

-    GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget);
-    if ( win && cursor.Ok() )
+    if (m_bitmap.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. */
+        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
+wxBitmapToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
+}
+
+
+// ------------------------------------------------------------------------
+// wxToggleButton
+// ------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)

 
 

-        gdk_window_set_cursor(win, cursor.GetCursor());
+bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
+                            const wxString &label, const wxPoint &pos,
+                            const wxSize &size, long style,
+                            const wxValidator& validator,
+                            const wxString &name)
+{
+    if (!PreCreation(parent, pos, size) ||
+        !CreateBase(parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG(wxT("wxToggleButton creation failed"));
+        return false;

     }
 
     }
 

-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+    // Create the gtk widget.
+    m_widget = gtk_toggle_button_new_with_mnemonic("");
+    g_object_ref(m_widget);
+
+    SetLabel(label);
+
+    g_signal_connect (m_widget, "clicked",
+                      G_CALLBACK (gtk_togglebutton_clicked_callback),
+                      this);
+
+    m_parent->DoAddChild(this);
+
+    PostCreation(size);
+
+    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)
+{
+    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+
+    if (state == GetValue())
+        return;
+
+    GTKDisableEvents();
+
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+
+    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"));
+
+    return GTK_TOGGLE_BUTTON(m_widget)->active;
+}
+
+void wxToggleButton::SetLabel(const wxString& label)
+{
+    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+
+    wxControl::SetLabel(label);
+
+    const wxString labelGTK = GTKConvertMnemonics(label);
+
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
+
+    ApplyWidgetStyle( false );
+}
+
+bool wxToggleButton::Enable(bool enable /*=true*/)
+{
+    if (!wxControl::Enable(enable))
+        return false;
+
+    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(GTK_BIN(m_widget)->child, style);
+}
+
+GdkWindow *
+wxToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    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;

 }
 
 }
 

-#endif // wxUSE_TOGGLEBTN
+// static
+wxVisualAttributes
+wxToggleButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
+}

 
 

+#endif // wxUSE_TOGGLEBTN