fixed another place where wxString was used as bool

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index b71a04884d74a3a0368b47b4f3836275afa59670..6a02c24538040d05d36c283c38f87d1eeab54457 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/bmpbuttn.cpp
+// Name:        src/gtk/bmpbuttn.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,8 +10,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
@@ -24,13 +22,6 @@
 
 class wxBitmapButton;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -134,7 +125,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxString &name )
 {
     m_needParent = true;
-    m_acceptsFocus = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
@@ -155,17 +145,18 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_bmpbutton_clicked_callback),
+                            this);
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "released",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
+    g_signal_connect (m_widget, "enter",
+                      G_CALLBACK (gtk_bmpbutton_enter_callback), this);
+    g_signal_connect (m_widget, "leave",
+                      G_CALLBACK (gtk_bmpbutton_leave_callback), this);
+    g_signal_connect (m_widget, "pressed",
+                      G_CALLBACK (gtk_bmpbutton_press_callback), this);
+    g_signal_connect (m_widget, "released",
+                      G_CALLBACK (gtk_bmpbutton_release_callback), this);
 
     m_parent->DoAddChild( this );
 
@@ -174,14 +165,6 @@ bool wxBitmapButton::Create( wxWindow *parent,
     return true;
 }
 
-void wxBitmapButton::SetDefault()
-{
-    GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
-    gtk_widget_grab_default( m_widget );
-
-    SetSize( m_x, m_y, m_width, m_height );
-}
-
 void wxBitmapButton::SetLabel( const wxString &label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
@@ -189,16 +172,9 @@ void wxBitmapButton::SetLabel( const wxString &label )
     wxControl::SetLabel( label );
 }
 
-wxString wxBitmapButton::GetLabel() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
-
-    return wxControl::GetLabel();
-}
-
 void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    if ( !BUTTON_CHILD(m_widget) )
+    if (!GTK_BIN(m_widget)->child)
         return;
 
     wxButton::DoApplyWidgetStyle(style);
@@ -211,7 +187,7 @@ void wxBitmapButton::OnSetBitmap()
     InvalidateBestSize();
 
     wxBitmap the_one;
-    if (!m_isEnabled)
+    if (!IsThisEnabled())
         the_one = m_bmpDisabled;
     else if (m_isSelected)
         the_one = m_bmpSelected;
@@ -226,34 +202,27 @@ void wxBitmapButton::OnSetBitmap()
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
-    GtkWidget *child = BUTTON_CHILD(m_widget);
+    GtkWidget *child = GTK_BIN(m_widget)->child;
     if (child == NULL)
     {
         // initial bitmap
         GtkWidget *pixmap;
-#ifdef __WXGTK20__
+
         if (the_one.HasPixbuf())
             pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
         else
             pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
-#else
-        pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
-#endif
+
         gtk_widget_show(pixmap);
         gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
     }
     else
     {   // subsequent bitmaps
-#ifdef __WXGTK20__
         GtkImage *pixmap = GTK_IMAGE(child);
         if (the_one.HasPixbuf())
             gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
         else
             gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
-#else
-        GtkPixmap *pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
-#endif
     }
 }
 
@@ -297,4 +266,3 @@ void wxBitmapButton::EndSelect()
 }
 
 #endif // wxUSE_BMPBUTTON
-