X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/bmpbuttn.cpp diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index dc359f07c7..7920f09130 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -1,21 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.cpp +// Name: src/gtk/bmpbuttn.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bmpbuttn.h" -#endif - -#include "wx/bmpbuttn.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_BMPBUTTON -#include +#include "wx/bmpbuttn.h" + #include //----------------------------------------------------------------------------- @@ -24,13 +22,6 @@ class wxBitmapButton; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -41,65 +32,72 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId()); event.SetEventObject(button); - button->GetEventHandler()->ProcessEvent(event); + 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(); + 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->NotFocus(); + 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->StartSelect(); + 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->EndSelect(); + button->GTKReleased(); +} } //----------------------------------------------------------------------------- @@ -108,85 +106,65 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) -wxBitmapButton::wxBitmapButton() +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 ) +bool wxBitmapButton::Create( wxWindow *parent, + wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString &name ) { - 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_bitmap = bitmap; - m_disabled = bitmap; - m_focus = bitmap; - m_selected = bitmap; - - m_label = ""; - + m_bmpNormal = bitmap; + m_widget = gtk_button_new(); + g_object_ref(m_widget); -#if (GTK_MINOR_VERSION > 0) if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); -#endif - if (m_bitmap.Ok()) + if (m_bmpNormal.Ok()) { - wxSize newSize = size; - - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); - GtkWidget *pixmap = gtk_pixmap_new( m_bitmap.GetPixmap(), mask ); - - gtk_widget_show( pixmap ); - gtk_container_add( GTK_CONTAINER(m_widget), pixmap ); - - int border = 10; - if (style & wxNO_BORDER) border = 4; - if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border; - if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border; - SetSize( newSize.x, newSize.y ); + OnSetBitmap(); } - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)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_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(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); - - 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 ); + + PostCreation(size); + + return true; } void wxBitmapButton::SetLabel( const wxString &label ) @@ -196,124 +174,92 @@ void wxBitmapButton::SetLabel( const wxString &label ) wxControl::SetLabel( label ); } -wxString wxBitmapButton::GetLabel() const +void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style) { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") ); + if (!GTK_BIN(m_widget)->child) + return; - return wxControl::GetLabel(); + wxButton::DoApplyWidgetStyle(style); } -void wxBitmapButton::ApplyWidgetStyle() +void wxBitmapButton::OnSetBitmap() { -} + wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); -void wxBitmapButton::SetBitmap() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); + InvalidateBestSize(); wxBitmap the_one; - - if (!m_isEnabled) - the_one = m_disabled; - else + 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) { - if (m_isSelected) - { - the_one = m_selected; - } - else - { - if (m_hasFocus) - the_one = m_focus; - else - the_one = m_bitmap; - } + image = gtk_image_new(); + gtk_widget_show(image); + gtk_container_add(GTK_CONTAINER(m_widget), image); } - - if (!the_one.Ok()) the_one = m_bitmap; - if (!the_one.Ok()) return; - - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child ); - - GdkBitmap *mask = (GdkBitmap *) NULL; - if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap(); - - gtk_pixmap_set( g_pixmap, the_one.GetPixmap(), mask ); -} - -void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - if ( ! m_disabled.Ok() ) return; - m_disabled = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - if ( ! m_focus.Ok() ) return; - m_focus = bitmap; - - SetBitmap(); + // 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()); } -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) +wxSize wxBitmapButton::DoGetBestSize() const { - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - if (!m_bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); + return wxControl::DoGetBestSize(); } -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) +bool wxBitmapButton::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); + if ( !wxWindow::Enable(enable) ) + return false; - if ( ! m_selected.Ok() ) return; - m_selected = bitmap; + OnSetBitmap(); - SetBitmap(); + return true; } -bool wxBitmapButton::Enable( bool enable ) +void wxBitmapButton::GTKMouseEnters() { - if ( !wxWindow::Enable(enable) ) - return FALSE; - - SetBitmap(); - - return TRUE; + m_mouseHovers = true; + OnSetBitmap(); } -void wxBitmapButton::HasFocus() +void wxBitmapButton::GTKMouseLeaves() { - m_hasFocus = TRUE; - SetBitmap(); + m_mouseHovers = false; + OnSetBitmap(); } -void wxBitmapButton::NotFocus() +void wxBitmapButton::GTKPressed() { - m_hasFocus = FALSE; - SetBitmap(); + m_isPressed = true; + OnSetBitmap(); } -void wxBitmapButton::StartSelect() +void wxBitmapButton::GTKReleased() { - m_isSelected = TRUE; - SetBitmap(); + m_isPressed = false; + OnSetBitmap(); } -void wxBitmapButton::EndSelect() +void wxBitmapButton::OnFocusChange(wxFocusEvent& event) { - m_isSelected = FALSE; - SetBitmap(); + event.Skip(); + OnSetBitmap(); } -#endif +#endif // wxUSE_BMPBUTTON