X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67a6726a2c83c6cb6e046311c23cca75c37fbbee..5875d39c9ba19f518e691792524f2fd03261c825:/src/gtk1/bmpbuttn.cpp?ds=inline diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 8fb62fc085..b71a04884d 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -7,16 +7,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bmpbuttn.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/bmpbuttn.h" +#include "wx/defs.h" #if wxUSE_BMPBUTTON -#include -#include +#include "wx/bmpbuttn.h" + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // classes @@ -41,6 +41,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (g_isIdle) @@ -53,11 +54,13 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma event.SetEventObject(button); button->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "enter" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (!button->m_hasVMT) return; @@ -65,11 +68,13 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB button->HasFocus(); } +} //----------------------------------------------------------------------------- // "leave" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (!button->m_hasVMT) return; @@ -77,11 +82,13 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB button->NotFocus(); } +} //----------------------------------------------------------------------------- // "pressed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (!button->m_hasVMT) return; @@ -89,11 +96,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; @@ -101,6 +110,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma button->EndSelect(); } +} //----------------------------------------------------------------------------- // wxBitmapButton @@ -108,50 +118,44 @@ 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; + 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_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; - int border = (style & wxNO_BORDER) ? 4 : 10; - 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 ); - SetBitmap(); + 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", @@ -165,13 +169,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); + PostCreation(size); - return TRUE; + return true; } void wxBitmapButton::SetDefault() @@ -191,116 +191,109 @@ void wxBitmapButton::SetLabel( const wxString &label ) wxString wxBitmapButton::GetLabel() const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid button") ); return wxControl::GetLabel(); } -void wxBitmapButton::ApplyWidgetStyle() +void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style) { - if (GTK_BUTTON(m_widget)->child == NULL) return; - - wxButton::ApplyWidgetStyle(); + 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_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; GdkBitmap *mask = (GdkBitmap *) NULL; if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap(); - GtkButton *bin = GTK_BUTTON(m_widget); - if (bin->child == NULL) - { // initial bitmap - GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); + 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 + } + else { // subsequent bitmaps - GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child); - gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); +#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::SetBitmapDisabled( const wxBitmap& bitmap ) +wxSize wxBitmapButton::DoGetBestSize() const { - if (!bitmap.Ok()) return; - m_disabled = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_focus = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_selected = bitmap; - - SetBitmap(); + return wxControl::DoGetBestSize(); } bool wxBitmapButton::Enable( bool enable ) { if ( !wxWindow::Enable(enable) ) - return FALSE; + return false; - SetBitmap(); + OnSetBitmap(); - return TRUE; + return true; } void wxBitmapButton::HasFocus() { - m_hasFocus = TRUE; - SetBitmap(); + m_hasFocus = true; + OnSetBitmap(); } void wxBitmapButton::NotFocus() { - m_hasFocus = FALSE; - SetBitmap(); + m_hasFocus = false; + OnSetBitmap(); } void wxBitmapButton::StartSelect() { - m_isSelected = TRUE; - SetBitmap(); + m_isSelected = true; + OnSetBitmap(); } void wxBitmapButton::EndSelect() { - m_isSelected = FALSE; - SetBitmap(); + m_isSelected = false; + OnSetBitmap(); } #endif // wxUSE_BMPBUTTON