X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29149a64916d6fdc53e445adca9ef83bc58fb6c3..6636ef8ddf9eda0d0352c29d98cb141676a51a2d:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index ca651c8b61..109281084a 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/bmpbuttn.cpp +// Name: src/gtk1/bmpbuttn.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,18 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bmpbuttn.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_BMPBUTTON #include "wx/bmpbuttn.h" -#include -#include +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // classes @@ -43,6 +39,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (g_isIdle) @@ -53,37 +50,43 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma 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->GTKSetHasFocus(); +} } //----------------------------------------------------------------------------- // "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->GTKSetNotFocus(); +} } //----------------------------------------------------------------------------- // "pressed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (!button->m_hasVMT) return; @@ -91,11 +94,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; @@ -103,56 +108,50 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma button->EndSelect(); } +} //----------------------------------------------------------------------------- // wxBitmapButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) - -wxBitmapButton::wxBitmapButton() +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 ) +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; + 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_bitmaps[State_Normal] = bitmap; m_widget = gtk_button_new(); -#if (GTK_MINOR_VERSION > 0) if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); -#endif - if (m_bmpNormal.Ok()) + if (bitmap.IsOk()) { - wxSize newSize = size; - int border = (style & wxNO_BORDER) ? 4 : 10; - if (newSize.x == -1) - newSize.x = m_bmpNormal.GetWidth()+border; - if (newSize.y == -1) - newSize.y = m_bmpNormal.GetHeight()+border; - SetSize( newSize.x, newSize.y ); 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", @@ -166,21 +165,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(size); - 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 ); + return true; } void wxBitmapButton::SetLabel( const wxString &label ) @@ -190,100 +177,91 @@ 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 ( !BUTTON_CHILD(m_widget) ) + return; - return wxControl::GetLabel(); -} - -void wxBitmapButton::ApplyWidgetStyle() -{ - if (GTK_BUTTON(m_widget)->child == NULL) return; - - wxButton::ApplyWidgetStyle(); + wxButton::DoApplyWidgetStyle(style); } void wxBitmapButton::OnSetBitmap() { wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); - wxBitmap the_one; - if (!m_isEnabled) - the_one = m_bmpDisabled; - else if (m_isSelected) - the_one = m_bmpSelected; - 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; - } - } + InvalidateBestSize(); - if (!the_one.Ok()) the_one = m_bmpNormal; - if (!the_one.Ok()) return; - - GdkBitmap *mask = (GdkBitmap *) NULL; + wxBitmap the_one; + if (!IsThisEnabled()) + the_one = GetBitmapDisabled(); + else if (m_isSelected) + the_one = GetBitmapPressed(); + else if (HasFocus()) + the_one = GetBitmapFocus(); + + if (!the_one.IsOk()) + { + the_one = GetBitmapLabel(); + if (!the_one.IsOk()) + return; + } + + GdkBitmap *mask = NULL; if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap(); - GtkButton *bin = GTK_BUTTON(m_widget); - if (bin->child == NULL) + GtkWidget *child = BUTTON_CHILD(m_widget); + if (child == NULL) { // initial bitmap - GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); + GtkWidget *pixmap; + pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); gtk_widget_show(pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap); } else { // subsequent bitmaps - GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child); - gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); + GtkPixmap *pixmap = GTK_PIXMAP(child); + gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask); } } +wxSize wxBitmapButton::DoGetBestSize() const +{ + return wxControl::DoGetBestSize(); +} + bool wxBitmapButton::Enable( bool enable ) { if ( !wxWindow::Enable(enable) ) - return FALSE; + return false; OnSetBitmap(); - return TRUE; + return true; } -void wxBitmapButton::HasFocus() +void wxBitmapButton::GTKSetHasFocus() { - m_hasFocus = TRUE; + m_hasFocus = true; OnSetBitmap(); } -void wxBitmapButton::NotFocus() +void wxBitmapButton::GTKSetNotFocus() { - 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(); } #endif // wxUSE_BMPBUTTON -