X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 2954d03cf7..55ca28b5c2 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -14,240 +14,28 @@
 
 #include "wx/bmpbuttn.h"
 
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "clicked"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
-    event.SetEventObject(button);
-    button->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "enter"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->HasFocus();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "leave"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->NotFocus();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "pressed"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->StartSelect();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "released"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->EndSelect();
-}
-}
-
-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
-void wxBitmapButton::Init()
-{
-    m_hasFocus =
-    m_isSelected = false;
-}
-
-bool wxBitmapButton::Create( wxWindow *parent,
-                             wxWindowID id,
-                             const wxBitmap& bitmap,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxValidator& validator,
-                             const wxString &name )
-{
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator, name ))
-    {
-        wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
+bool wxBitmapButton::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxBitmap& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
+{
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )
         return false;
-    }
-
-    m_bmpNormal = bitmap;
-
-    m_widget = gtk_button_new();
-
-    if (style & wxNO_BORDER)
-       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
-    if (m_bmpNormal.Ok())
+    if ( bitmap.IsOk() )
     {
-        OnSetBitmap();
-    }
-
-    g_signal_connect_after (m_widget, "clicked",
-                            G_CALLBACK (gtk_bmpbutton_clicked_callback),
-                            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 );
-
-    PostCreation(size);
-
-    return true;
-}
-
-void wxBitmapButton::SetLabel( const wxString &label )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-    wxControl::SetLabel( label );
-}
-
-void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
-{
-    if (!GTK_BIN(m_widget)->child)
-        return;
-
-    wxButton::DoApplyWidgetStyle(style);
-}
-
-void wxBitmapButton::OnSetBitmap()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
-
-    InvalidateBestSize();
-
-    wxBitmap the_one;
-    if (!IsThisEnabled())
-        the_one = m_bmpDisabled;
-    else if (m_isSelected)
-        the_one = m_bmpSelected;
-    else if (m_hasFocus)
-        the_one = m_bmpFocus;
-    else
-        the_one = m_bmpNormal;
-
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
-
-    GtkWidget *child = GTK_BIN(m_widget)->child;
-    if (child == NULL)
-    {
-        // initial bitmap
-        GtkWidget *pixmap = 
-            gtk_image_new_from_pixbuf(the_one.GetPixbuf());
+        SetBitmapLabel(bitmap);
 
-        gtk_widget_show(pixmap);
-        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);
     }
-    else
-    {   // subsequent bitmaps
-        GtkImage *pixmap = GTK_IMAGE(child);
-        gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
-    }
-}
-
-wxSize wxBitmapButton::DoGetBestSize() const
-{
-    return wxControl::DoGetBestSize();
-}
-
-bool wxBitmapButton::Enable( bool enable )
-{
-    if ( !wxWindow::Enable(enable) )
-        return false;
-
-    OnSetBitmap();
 
     return true;
 }
-
-void wxBitmapButton::HasFocus()
-{
-    m_hasFocus = true;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::NotFocus()
-{
-    m_hasFocus = false;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::StartSelect()
-{
-    m_isSelected = true;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::EndSelect()
-{
-    m_isSelected = false;
-    OnSetBitmap();
-}
-
 #endif // wxUSE_BMPBUTTON