remove needless casting (no real change)

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

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index a7a7b479261dbb0d860a950def367290369f68af..50b319394fe82fe6247d269ab2acb3d3a42d2b8a 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -21,23 +21,13 @@
     #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;

-extern wxCursor   g_globalCursor;

 
 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;
 


@@ -47,48 +37,41 @@ static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxTog
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
     event.SetInt(cb->GetValue());
     event.SetEventObject(cb);
     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)
 
 // ------------------------------------------------------------------------
 }
 }
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 // ------------------------------------------------------------------------

-// 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 ))
     {
     m_blockEvent = false;
 
     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;
     }
 
         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),


@@ -103,7 +86,7 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
 // 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"));
 


@@ -119,14 +102,14 @@ void wxToggleBitmapButton::SetValue(bool state)
 
 // 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"));
 
 {
     wxCHECK_RET(m_widget != NULL, wxT("invalid toggle button"));
 


@@ -136,29 +119,25 @@ void wxToggleBitmapButton::SetLabel(const wxBitmap& label)
     OnSetBitmap();
 }
 
     OnSetBitmap();
 }
 

-void wxToggleBitmapButton::OnSetBitmap()
+void wxBitmapToggleButton::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());

     }
 }
 
     }
 }
 

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

 {
     if (!wxControl::Enable(enable))
         return false;
 {
     if (!wxControl::Enable(enable))
         return false;


@@ -168,45 +147,20 @@ bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
     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);
 }
 
 {
     gtk_widget_modify_style(m_widget, style);
     gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 

-bool wxToggleBitmapButton::IsOwnGtkWindow(GdkWindow *window)
-{
-    return window == GTK_BUTTON(m_widget)->event_window;
-}
-
-void wxToggleBitmapButton::OnInternalIdle()
+GdkWindow *
+wxBitmapToggleButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    // Check if we have to show window now
-    if (GtkShowFromOnIdle()) return;
-    
-    wxCursor cursor = m_cursor;
-
-    if (g_globalCursor.Ok())
-        cursor = g_globalCursor;
-
-    GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
-    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;

 }
 
 }
 

-

 // 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;
 


@@ -223,7 +177,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);
 }


@@ -241,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),


@@ -299,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*/)


@@ -318,34 +274,12 @@ void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
     gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 
     gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
 }
 

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

 {
 {

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

 }
 
 }
 

-void wxToggleButton::OnInternalIdle()
-{
-    wxCursor cursor = m_cursor;
-
-    if (g_globalCursor.Ok())
-        cursor = g_globalCursor;
-
-    GdkWindow *win = GTK_BUTTON(m_widget)->event_window;
-    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);
-}
-
-

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