X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..258bcbfbd3b519d2498c6f0218ee938181170900:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index b056ecbcbd..55b275d0bb 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -7,16 +7,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bmpbuttn.h" #endif -#include "wx/bmpbuttn.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" #if wxUSE_BMPBUTTON -#include -#include +#include "wx/bmpbuttn.h" + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // classes @@ -108,20 +112,24 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma 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_marginX = - m_marginY = 0; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -129,34 +137,16 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi return FALSE; } - m_bitmap = bitmap; - m_disabled = bitmap; - m_focus = bitmap; - m_selected = bitmap; + m_bmpNormal = 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_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", @@ -173,11 +163,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); + PostCreation(size); return TRUE; } @@ -204,83 +190,91 @@ wxString wxBitmapButton::GetLabel() const return wxControl::GetLabel(); } -void wxBitmapButton::ApplyWidgetStyle() +void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style) { + if ( !BUTTON_CHILD(m_widget) ) + return; + + wxButton::DoApplyWidgetStyle(style); } -void wxBitmapButton::SetBitmap() +void wxBitmapButton::OnSetBitmap() { - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); + InvalidateBestSize(); + wxBitmap the_one; - if (!m_isEnabled) - the_one = m_disabled; + 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_selected; + the_one = m_bmpSelected; } else { if (m_hasFocus) - the_one = m_focus; + the_one = m_bmpFocus; else - the_one = m_bitmap; + the_one = m_bmpNormal; } } - if (!the_one.Ok()) the_one = m_bitmap; + if (!the_one.Ok()) the_one = m_bmpNormal; 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(); -} - -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - if (!m_bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); + GtkWidget *child = BUTTON_CHILD(m_widget); + if (child == NULL) + { + // initial bitmap + 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 +#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 + } } -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) +wxSize wxBitmapButton::DoGetBestSize() const { - wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - - if ( ! m_selected.Ok() ) return; - m_selected = bitmap; - - SetBitmap(); + 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; } bool wxBitmapButton::Enable( bool enable ) @@ -288,7 +282,7 @@ bool wxBitmapButton::Enable( bool enable ) if ( !wxWindow::Enable(enable) ) return FALSE; - SetBitmap(); + OnSetBitmap(); return TRUE; } @@ -296,25 +290,25 @@ bool wxBitmapButton::Enable( bool enable ) void wxBitmapButton::HasFocus() { m_hasFocus = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::NotFocus() { m_hasFocus = FALSE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::StartSelect() { m_isSelected = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::EndSelect() { m_isSelected = FALSE; - SetBitmap(); + OnSetBitmap(); } #endif // wxUSE_BMPBUTTON