X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3502e687e29f46c747be16a58d39fe79e7b1c7bc..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/gtk1/bmpbuttn.cpp?ds=sidebyside diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 0984b03302..25567ce369 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -1,20 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.cpp +// Name: 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/defs.h" + +#if wxUSE_BMPBUTTON + #include "wx/bmpbuttn.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // classes @@ -22,6 +25,13 @@ class wxBitmapButton; +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -34,9 +44,12 @@ extern bool g_blockEventsOnDrag; static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (!button->HasVMT()) return; + 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); @@ -48,10 +61,10 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (!button->HasVMT()) return; + if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - button->HasFocus(); + button->HasFocus(); } //----------------------------------------------------------------------------- @@ -60,10 +73,10 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (!button->HasVMT()) return; + if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - button->NotFocus(); + button->NotFocus(); } //----------------------------------------------------------------------------- @@ -72,10 +85,10 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (!button->HasVMT()) return; + if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - button->StartSelect(); + button->StartSelect(); } //----------------------------------------------------------------------------- @@ -84,211 +97,193 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (!button->HasVMT()) return; + if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; - button->EndSelect(); + button->EndSelect(); } //----------------------------------------------------------------------------- // wxBitmapButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) wxBitmapButton::wxBitmapButton() { } bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, - const wxPoint &pos, const wxSize &size, + const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; - - wxSize newSize = size; - - PreCreation( parent, id, pos, newSize, style, name ); - - SetValidator( validator ); - - m_bitmap = bitmap; - m_disabled = bitmap; - m_focus = bitmap; - m_selected = bitmap; - - m_label = ""; - + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxBitmapButton creation failed") ); + return FALSE; + } + + m_bmpNormal = + m_bmpDisabled = + m_bmpFocus = + m_bmpSelected = bitmap; + m_widget = gtk_button_new(); - - if (m_bitmap.Ok()) + +#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()) { - 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 ); + 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(); } - - if (newSize.x == -1) newSize.x = m_bitmap.GetHeight()+10; - if (newSize.y == -1) newSize.y = m_bitmap.GetWidth()+10; - SetSize( newSize.x, newSize.y ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", + + 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_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_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_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_connect( GTK_OBJECT(m_widget), "released", GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this ); - - m_parent->AddChild( this ); - (m_parent->m_insertCallback)( m_parent, 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 ); } void wxBitmapButton::SetLabel( const wxString &label ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); wxControl::SetLabel( label ); } wxString wxBitmapButton::GetLabel() const { - wxCHECK_MSG( m_widget != NULL, "", "invalid button" ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") ); return wxControl::GetLabel(); } void wxBitmapButton::ApplyWidgetStyle() { + if ( !BUTTON_CHILD(m_widget) ) + return; + + wxButton::ApplyWidgetStyle(); } -void wxBitmapButton::SetBitmap() +void wxBitmapButton::OnSetBitmap() { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); wxBitmap the_one; - - if ( ! m_isEnabled ) - the_one = m_disabled; - else + 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_selected; - } - else - { - if ( m_hasFocus ) - the_one = m_focus; - else - the_one = m_bitmap; + 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_bitmap; - if ( ! the_one.Ok() ) return; - - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child ); - + 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(); - - gtk_pixmap_set( g_pixmap, the_one.GetPixmap(), mask ); -} - -void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - if ( ! m_disabled.Ok() ) return; - m_disabled = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - if ( ! m_focus.Ok() ) return; - m_focus = bitmap; - - SetBitmap(); -} -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - if (!m_bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); + GtkWidget *child = BUTTON_CHILD(m_widget); + if (child == NULL) + { + // initial bitmap + GtkWidget *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(child); + gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); + } } -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) +bool wxBitmapButton::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); - - if ( ! m_selected.Ok() ) return; - m_selected = bitmap; + if ( !wxWindow::Enable(enable) ) + return FALSE; - SetBitmap(); -} - -void wxBitmapButton::Enable( const bool enable ) -{ - wxWindow::Enable(enable); + OnSetBitmap(); - SetBitmap(); + return TRUE; } 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 +