X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0aeebed0a3003f455e2bd7e962143faa1dde4c8..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk1/bmpbuttn.cpp diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index b209fabcc5..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,20 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bmpbuttn.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_BMPBUTTON #include "wx/bmpbuttn.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // classes @@ -45,6 +39,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (g_isIdle) @@ -55,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; @@ -93,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; @@ -105,17 +108,16 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma button->EndSelect(); } +} //----------------------------------------------------------------------------- // wxBitmapButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) - void wxBitmapButton::Init() { m_hasFocus = - m_isSelected = FALSE; + m_isSelected = false; } bool wxBitmapButton::Create( wxWindow *parent, @@ -127,29 +129,29 @@ bool wxBitmapButton::Create( wxWindow *parent, 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 = bitmap; + m_bitmaps[State_Normal] = 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(); } - 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,15 +167,7 @@ bool wxBitmapButton::Create( wxWindow *parent, PostCreation(size); - 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 ) @@ -183,13 +177,6 @@ void wxBitmapButton::SetLabel( const wxString &label ) wxControl::SetLabel( label ); } -wxString wxBitmapButton::GetLabel() const -{ - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") ); - - return wxControl::GetLabel(); -} - void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style) { if ( !BUTTON_CHILD(m_widget) ) @@ -203,33 +190,23 @@ void wxBitmapButton::OnSetBitmap() wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); InvalidateBestSize(); - - 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; - } - } - - 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(); GtkWidget *child = BUTTON_CHILD(m_widget); @@ -237,29 +214,14 @@ void wxBitmapButton::OnSetBitmap() { // 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 } } @@ -271,36 +233,35 @@ wxSize wxBitmapButton::DoGetBestSize() const 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 -