corrected off by 1 error in cMB2WC() call (thanks valgrind)

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index cc2f7db78dd19a801d2604718df237a0954b487e..734b351d26ba5ea7f32c2548fdf3855ad070aae1 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -21,12 +21,6 @@
     #include "wx/button.h"
 #endif
 
     #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 bool      g_blockEventsOnDrag;
 #include "wx/gtk/private.h"
 
 extern bool      g_blockEventsOnDrag;


@@ -34,9 +28,6 @@ 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;
 


@@ -64,9 +55,6 @@ bool wxToggleBitmapButton::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) ||
     m_blockEvent = false;
 
     if (!PreCreation(parent, pos, size) ||


@@ -76,18 +64,14 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_bitmap = label;
-

     // Create the gtk widget.
     m_widget = gtk_toggle_button_new();
 
     if (style & wxNO_BORDER)
     // 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 );
+        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );

 
 

-    if (m_bitmap.Ok())
-    {
-        OnSetBitmap();
-    }
+    m_bitmap = label;
+    OnSetBitmap();

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


@@ -122,7 +106,7 @@ 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_get_active((GtkToggleButton*)m_widget);

 }
 
 void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
 }
 
 void wxToggleBitmapButton::SetLabel(const wxBitmap& label)


@@ -139,21 +123,17 @@ void wxToggleBitmapButton::OnSetBitmap()
 {
     if (!m_bitmap.Ok()) return;
 
 {
     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)
+    GtkWidget* image = ((GtkBin*)m_widget)->child;
+    if (image == NULL)

     {
         // initial bitmap
     {
         // initial bitmap

-        GtkWidget *pixmap = gtk_pixmap_new(m_bitmap.GetPixmap(), mask);
-        gtk_widget_show(pixmap);
-        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
+        image = gtk_image_new_from_pixbuf(m_bitmap.GetPixbuf());
+        gtk_widget_show(image);
+        gtk_container_add((GtkContainer*)m_widget, image);

     }
     else
     {   // subsequent bitmaps
     }
     else
     {   // subsequent bitmaps

-        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(g_pixmap, m_bitmap.GetPixmap(), mask);
+        gtk_image_set_from_pixbuf((GtkImage*)image, m_bitmap.GetPixbuf());

     }
 }
 
     }
 }
 


@@ -215,21 +195,19 @@ 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) ||
     m_blockEvent = false;
 
     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 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("");
+
+    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),


@@ -273,7 +251,11 @@ 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));
+
+    ApplyWidgetStyle( false );

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