Make status bar grip move to the left in RTL.

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index cfa6e1efdf9c7c855414625ddc6bd7da4f2139c1..cc2f7db78dd19a801d2604718df237a0954b487e 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,192 +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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 #if wxUSE_TOGGLEBTN
 
 
 #if wxUSE_TOGGLEBTN
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/tglbtn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
+// FIXME: Use GtkImage instead of GtkPixmap.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
+#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;

 
 

-// void gtk_togglebutton_clicked_callback(GtkWidget *widget, wxToggleButton *cb)
-// Callback function given to gtk.
-void wxToggleButton::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 (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-   if (!cb->m_hasVMT || g_blockEventsOnDrag)
-      return;
+    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->GetEventHandler()->ProcessEvent(event);
+    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);
+}

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 

-// bool Create(wxWindow *parent, wxWindowID id, const wxString &label,
-//             const wxPoint &pos, const wxSize &size, long style,
-//             const wxValidator& validator, const wxString &name)
-// Create the control.
-bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
-                            const wxString &label, const wxPoint &pos,
+// ------------------------------------------------------------------------
+// wxToggleBitmapButton
+// ------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToggleBitmapButton, wxControl)
+
+bool wxToggleBitmapButton::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;
-
-   if (!PreCreation(parent, pos, size) ||
-       !CreateBase(parent, id, pos, size, style, validator, name )) {
-      wxFAIL_MSG(wxT("wxToggleButton creation failed"));
-      return FALSE;
-   }
+    m_needParent = true;
+    m_acceptsFocus = true;

 
 

-   wxControl::SetLabel(label);
+    m_blockEvent = false;

 
 

-   // Create the gtk widget.
-   m_widget = gtk_toggle_button_new_with_label(m_label.mbc_str());
+    if (!PreCreation(parent, pos, size) ||
+       !CreateBase(parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
+        return false;
+    }

 
 

-   gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
-                      GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
-                      (gpointer *)this);
+    m_bitmap = label;

 
 

-   m_parent->DoAddChild(this);
+    // Create the gtk widget.
+    m_widget = gtk_toggle_button_new();

 
 

-   PostCreation();
+    if (style & wxNO_BORDER)
+       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );

 
 

-   SetFont(parent->GetFont());
+    if (m_bitmap.Ok())
+    {
+        OnSetBitmap();
+    }

 
 

-   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);
+    g_signal_connect (m_widget, "clicked",
+                      G_CALLBACK (gtk_togglebutton_clicked_callback),
+                      this);

 
 

-   SetBackgroundColour(parent->GetBackgroundColour());
-   SetForegroundColour(parent->GetForegroundColour());
+    m_parent->DoAddChild(this);

 
 

-   Show(TRUE);
+    PostCreation(size);

 
 

-   return TRUE;
+    return true;

 }
 
 // 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 wxToggleBitmapButton::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;

 
 

-   gtk_signal_disconnect_by_func(GTK_OBJECT(m_widget),
-                                 GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
-                                 (gpointer *)this);
+    m_blockEvent = true;

 
 

-   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);

 
 

-   gtk_signal_connect(GTK_OBJECT(m_widget), "clicked",
-                      GTK_SIGNAL_FUNC(gtk_togglebutton_clicked_callback),
-                      (gpointer *)this);
+    m_blockEvent = false;

 }
 
 // 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 wxToggleBitmapButton::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(m_widget)->active;

 }
 
 }
 

-// void SetLabel(const wxString& label)
-// Set the button's label.
-void wxToggleButton::SetLabel(const wxString& label)
+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);
+    }
+}
+
+bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
+{
+    if (!wxControl::Enable(enable))
+        return false;
+
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+
+    return true;
+}
+
+void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
+}
+
+GdkWindow *
+wxToggleBitmapButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return GTK_BUTTON(m_widget)->event_window;
+}
+
+// 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))

 {
 {

-   wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+    return GetDefaultAttributesFromGTKWidget(gtk_toggle_button_new);
+}
+
+
+// ------------------------------------------------------------------------
+// wxToggleButton
+// ------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+
+bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
+                            const wxString &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("wxToggleButton creation failed"));
+        return false;
+    }
+
+    wxControl::SetLabel(label);

 
 

-   wxControl::SetLabel(label);
+    // Create the gtk widget.
+    m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );

 
 

-   gtk_label_set(GTK_LABEL(GTK_BUTTON(m_widget)->child),
-                 GetLabel().mbc_str());
+    g_signal_connect (m_widget, "clicked",
+                      G_CALLBACK (gtk_togglebutton_clicked_callback),
+                      this);
+
+    m_parent->DoAddChild(this);
+
+    PostCreation(size);
+
+    return true;

 }
 
 }
 

-// bool Enable(bool enable)
-// Enable (or disable) the control.
-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+// void SetValue(bool state)
+// Set the value of the toggle button.
+void wxToggleButton::SetValue(bool state)

 {
 {

-   if (!wxControl::Enable(enable))
-      return FALSE;
+    wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
+
+    if (state == GetValue())
+        return;
+
+    m_blockEvent = true;

 
 

-   gtk_widget_set_sensitive(GTK_BUTTON(m_widget)->child, enable);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);

 
 

-   return TRUE;
+    m_blockEvent = false;

 }
 
 }
 

-// void ApplyWidgetStyle()
-// I don't really know what this does.
-void wxToggleButton::ApplyWidgetStyle()
+// bool GetValue() const
+// Get the value of the toggle button.
+bool wxToggleButton::GetValue() const

 {
 {

-   SetWidgetStyle();
-   gtk_widget_set_style(m_widget, m_widgetStyle);
-   gtk_widget_set_style(GTK_BUTTON(m_widget)->child, m_widgetStyle);
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
+
+    return GTK_TOGGLE_BUTTON(m_widget)->active;

 }
 
 }
 

-// bool IsOwnGtkWindow(GdkWindow *window)
-// I'm not really sure what this is for, either.
-bool wxToggleButton::IsOwnGtkWindow(GdkWindow *window)
+void wxToggleButton::SetLabel(const wxString& label)

 {
 {

-   return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window);
+    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()));

 }
 
 }
 

-// void OnInternalIdle()
-// Apparently gtk cursors are difficult to deal with.
-void wxToggleButton::OnInternalIdle()
+bool wxToggleButton::Enable(bool enable /*=true*/)

 {
 {

-   wxCursor cursor = m_cursor;
-   if (g_globalCursor.Ok())
-      cursor = g_globalCursor;
+    if (!wxControl::Enable(enable))
+        return false;

 
 

-   if (GTK_TOGGLE_BUTTON(m_widget)->event_window && 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. */
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);

 
 

-      gdk_window_set_cursor(GTK_TOGGLE_BUTTON(m_widget)->event_window,
-                            cursor.GetCursor());
-   }
+    return true;
+}

 
 

-   UpdateWindowUI();
+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
 {
 // Get the "best" size for this control.
 wxSize wxToggleButton::DoGetBestSize() const
 {

-   wxSize ret(wxControl::DoGetBestSize());
-   if (ret.x < 80)
-      ret.x = 80;
+    wxSize ret(wxControl::DoGetBestSize());

 
 

-   return ret;
+    if (!HasFlag(wxBU_EXACTFIT))
+    {
+        if (ret.x < 80) ret.x = 80;
+    }
+
+    CacheBestSize(ret);
+    return ret;

 }
 
 }
 

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

 
 

+#endif // wxUSE_TOGGLEBTN