X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a4a02acd1b6f3925c719ed25cfc7c7500ff2f61..6eec70b984525aac09528c32411f19113620e284:/src/gtk/bmpbuttn.cpp

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 916cbf0f16..f6d2ee2e6e 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -14,251 +14,30 @@
 
 #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->GTKMouseEnters();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "leave"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->GTKMouseLeaves();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "pressed"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->GTKPressed();
-}
-}
-
-//-----------------------------------------------------------------------------
-// "released"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->GTKReleased();
-}
-}
-
-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
-
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
-BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
-    EVT_SET_FOCUS(wxBitmapButton::OnFocusChange)
-    EVT_KILL_FOCUS(wxBitmapButton::OnFocusChange)
-END_EVENT_TABLE()
-
-
-void wxBitmapButton::Init()
-{
-    m_mouseHovers =
-    m_isPressed = 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 );
-}
+        SetBitmapLabel(bitmap);
 
-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_isPressed)
-        the_one = m_bmpSelected;
-    else if (m_mouseHovers)
-        the_one = m_bmpHover;
-    else if (HasFocus())
-        the_one = m_bmpFocus;
-    else
-        the_one = m_bmpNormal;
-
-    if (!the_one.Ok())
-        the_one = m_bmpNormal;
-    if (!the_one.Ok())
-        return;
-
-    GtkWidget* image = GTK_BIN(m_widget)->child;
-    if (image == NULL)
-    {
-        image = gtk_image_new();
-        gtk_widget_show(image);
-        gtk_container_add(GTK_CONTAINER(m_widget), image);
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);
     }
-    // always use pixbuf, because pixmap mask does not
-    // work with disabled images in some themes
-    gtk_image_set_from_pixbuf(GTK_IMAGE(image), 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::GTKMouseEnters()
-{
-    m_mouseHovers = true;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::GTKMouseLeaves()
-{
-    m_mouseHovers = false;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::GTKPressed()
-{
-    m_isPressed = true;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::GTKReleased()
-{
-    m_isPressed = false;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::OnFocusChange(wxFocusEvent& event)
-{
-    event.Skip();
-    OnSetBitmap();
-}
-
 #endif // wxUSE_BMPBUTTON