[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 34f5bab8900580bc87501f81f22cb9232176b5b7..b3091ddaa86eff1d02f06d1b78116a78228391f1 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -45,6 +45,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (g_isIdle)
@@ -57,11 +58,13 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
 }
+}
 
 //-----------------------------------------------------------------------------
 // "enter"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
@@ -69,11 +72,13 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->HasFocus();
 }
+}
 
 //-----------------------------------------------------------------------------
 // "leave"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
@@ -81,11 +86,13 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->NotFocus();
 }
+}
 
 //-----------------------------------------------------------------------------
 // "pressed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
@@ -93,11 +100,13 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
 
     button->StartSelect();
 }
+}
 
 //-----------------------------------------------------------------------------
 // "released"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
     if (!button->m_hasVMT) return;
@@ -105,6 +114,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
     button->EndSelect();
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
@@ -115,7 +125,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 void wxBitmapButton::Init()
 {
     m_hasFocus =
-    m_isSelected = FALSE;
+    m_isSelected = false;
 }
 
 bool wxBitmapButton::Create( wxWindow *parent,
@@ -127,20 +137,17 @@ bool wxBitmapButton::Create( wxWindow *parent,
                              const wxValidator& validator,
                              const wxString &name )
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
-        return FALSE;
+        return false;
     }
 
-    m_bmpNormal   =
-    m_bmpDisabled =
-    m_bmpFocus    =
-    m_bmpSelected = bitmap;
+    m_bmpNormal = bitmap;
 
     m_widget = gtk_button_new();
 
@@ -152,7 +159,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
@@ -168,7 +175,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::SetDefault()
@@ -188,7 +195,7 @@ void wxBitmapButton::SetLabel( const wxString &label )
 
 wxString wxBitmapButton::GetLabel() const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") );
 
     return wxControl::GetLabel();
 }
@@ -206,7 +213,7 @@ void wxBitmapButton::OnSetBitmap()
     wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
 
     InvalidateBestSize();
-    
+
     wxBitmap the_one;
     if (!m_isEnabled)
         the_one = m_bmpDisabled;
@@ -215,19 +222,7 @@ void wxBitmapButton::OnSetBitmap()
     else if (m_hasFocus)
         the_one = m_bmpFocus;
     else
-    {
-        if (m_isSelected)
-        {
-            the_one = m_bmpSelected;
-        }
-        else
-        {
-            if (m_hasFocus)
-                the_one = m_bmpFocus;
-            else
-                the_one = m_bmpNormal;
-        }
-    }
+        the_one = m_bmpNormal;
 
     if (!the_one.Ok()) the_one = m_bmpNormal;
     if (!the_one.Ok()) return;
@@ -239,62 +234,69 @@ void wxBitmapButton::OnSetBitmap()
     if (child == NULL)
     {
         // initial bitmap
-        GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
+        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
-        GtkPixmap *g_pixmap = GTK_PIXMAP(child);
-        gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
+#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
     }
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
-    wxSize best;
-    
-    if (m_bmpNormal.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bmpNormal.GetWidth()+border;
-        best.y = m_bmpNormal.GetHeight()+border;
-    }
-    CacheBestSize(best);
-    return best;
+    return wxControl::DoGetBestSize();
 }
 
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
-        return FALSE;
+        return false;
 
     OnSetBitmap();
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::HasFocus()
 {
-    m_hasFocus = TRUE;
+    m_hasFocus = true;
     OnSetBitmap();
 }
 
 void wxBitmapButton::NotFocus()
 {
-    m_hasFocus = FALSE;
+    m_hasFocus = false;
     OnSetBitmap();
 }
 
 void wxBitmapButton::StartSelect()
 {
-    m_isSelected = TRUE;
+    m_isSelected = true;
     OnSetBitmap();
 }
 
 void wxBitmapButton::EndSelect()
 {
-    m_isSelected = FALSE;
+    m_isSelected = false;
     OnSetBitmap();
 }