VC6 compilation fix for native wxProgressDialog implementation.

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 1e7e2acfc56d9ea9a8d5bdae9b421c98f8b55ec3..e0bfe0e372fc8dd0c2d1dca3ebc6c72aabe8e4c5 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -7,7 +7,7 @@
 // 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".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -28,50 +28,41 @@ extern bool      g_blockEventsOnDrag;
 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, 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"));
+        wxFAIL_MSG(wxT("wxBitmapToggleButton creation failed"));

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

+    g_object_ref(m_widget);

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


@@ -90,32 +81,44 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
     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"));
 
     if (state == GetValue())
         return;
 
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 
     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"));
 
     return gtk_toggle_button_get_active((GtkToggleButton*)m_widget);
 }
 
 {
     wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
 
     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"));
 
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 


@@ -125,48 +128,53 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxToggleBitmapButton::OnSetBitmap()
+void wxBitmapToggleButton::OnSetBitmap()

 {
     if (!m_bitmap.Ok()) return;
 
     GtkWidget* image = ((GtkBin*)m_widget)->child;
     if (image == NULL)
     {
 {
     if (!m_bitmap.Ok()) return;
 
     GtkWidget* image = ((GtkBin*)m_widget)->child;
     if (image == NULL)
     {

-        // initial bitmap
-        image = gtk_image_new_from_pixbuf(m_bitmap.GetPixbuf());
+        image = gtk_image_new();

         gtk_widget_show(image);
         gtk_container_add((GtkContainer*)m_widget, image);
     }
         gtk_widget_show(image);
         gtk_container_add((GtkContainer*)m_widget, image);
     }

-    else
-    {   // subsequent bitmaps
-        gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());
-    }
+    // 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))
         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 
     if (!wxControl::Enable(enable))
         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 

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

     return true;
 }
 
     return true;
 }
 

-void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
+void wxBitmapToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
     gtk_widget_modify_style(m_widget, style);
     gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 
 GdkWindow *
 {
     gtk_widget_modify_style(m_widget, style);
     gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 
 GdkWindow *

-wxToggleBitmapButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
     return GTK_BUTTON(m_widget)->event_window;
 }
 
 // Get the "best" size for this control.
 {
     return GTK_BUTTON(m_widget)->event_window;
 }
 
 // Get the "best" size for this control.

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

 {
     wxSize best;
 
 {
     wxSize best;
 


@@ -183,7 +191,7 @@ wxSize wxToggleBitmapButton::DoGetBestSize() const
 
 // static
 wxVisualAttributes
 
 // static
 wxVisualAttributes

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

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


@@ -201,11 +209,6 @@ 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 ))
     {
     if (!PreCreation(parent, pos, size) ||
         !CreateBase(parent, id, pos, size, style, validator, name ))
     {


@@ -213,10 +216,11 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    wxControl::SetLabel(label);
-

     // Create the gtk widget.
     // Create the gtk widget.

-    m_widget = gtk_toggle_button_new_with_label( wxGTK_CONV( m_label ) );
+    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),
 
     g_signal_connect (m_widget, "clicked",
                       G_CALLBACK (gtk_togglebutton_clicked_callback),


@@ -229,6 +233,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)


@@ -238,11 +254,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


@@ -260,16 +276,23 @@ void wxToggleButton::SetLabel(const wxString& label)
 
     wxControl::SetLabel(label);
 
 
     wxControl::SetLabel(label);
 

-    gtk_label_set_text(GTK_LABEL(GTK_BIN(m_widget)->child), wxGTK_CONV(GetLabel()));
+    const wxString labelGTK = GTKConvertMnemonics(label);
+
+    gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
+
+    GTKApplyWidgetStyle( false );

 }
 
 bool wxToggleButton::Enable(bool enable /*=true*/)
 {
 }
 
 bool wxToggleButton::Enable(bool enable /*=true*/)
 {

-    if (!wxControl::Enable(enable))
+    if (!base_type::Enable(enable))

         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 
         return false;
 
     gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
 

+    if (enable)
+        GTKFixSensitivity();
+

     return true;
 }
 
     return true;
 }