X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..8aaef28406647d6aa706c34f57dd151f00b18e5b:/src/gtk/bmpbuttn.cpp diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index cd10cf260c..691e6912d7 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -13,12 +13,24 @@ #include "wx/bmpbuttn.h" +#if wxUSE_BMPBUTTON + +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxBitmapButton; +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -31,7 +43,9 @@ 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()); @@ -45,7 +59,7 @@ 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(); @@ -57,7 +71,7 @@ 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(); @@ -69,7 +83,7 @@ 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(); @@ -81,7 +95,7 @@ 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(); @@ -91,7 +105,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma // wxBitmapButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) wxBitmapButton::wxBitmapButton() { @@ -104,11 +118,12 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_needParent = TRUE; m_acceptsFocus = TRUE; - wxSize newSize = size; - - PreCreation( parent, id, pos, newSize, style, name ); - - SetValidator( validator ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxBitmapButton creation failed") ); + return FALSE; + } m_bitmap = bitmap; m_disabled = bitmap; @@ -118,21 +133,30 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi m_label = ""; 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()) { + 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 ); } - 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_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this ); @@ -145,9 +169,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi 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(); @@ -160,22 +182,22 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi 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(); } @@ -186,29 +208,29 @@ void wxBitmapButton::ApplyWidgetStyle() void wxBitmapButton::SetBitmap() { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); wxBitmap the_one; - if ( ! m_isEnabled ) + if (!m_isEnabled) the_one = m_disabled; else { - if ( m_isSelected ) + if (m_isSelected) { the_one = m_selected; } else { - if ( m_hasFocus ) + if (m_hasFocus) the_one = m_focus; else the_one = m_bitmap; } } - if ( ! the_one.Ok() ) the_one = m_bitmap; - if ( ! the_one.Ok() ) return; + 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 ); @@ -221,7 +243,7 @@ void wxBitmapButton::SetBitmap() void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); if ( ! m_disabled.Ok() ) return; m_disabled = bitmap; @@ -231,7 +253,7 @@ void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); if ( ! m_focus.Ok() ) return; m_focus = bitmap; @@ -241,7 +263,7 @@ void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); if (!m_bitmap.Ok()) return; m_bitmap = bitmap; @@ -251,7 +273,7 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) { - wxCHECK_RET( m_widget != NULL, "invalid button" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); if ( ! m_selected.Ok() ) return; m_selected = bitmap; @@ -259,11 +281,14 @@ void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) SetBitmap(); } -void wxBitmapButton::Enable( const bool enable ) +bool wxBitmapButton::Enable( bool enable ) { - wxWindow::Enable(enable); + if ( !wxWindow::Enable(enable) ) + return FALSE; + + SetBitmap(); - SetBitmap(); + return TRUE; } void wxBitmapButton::HasFocus() @@ -289,3 +314,5 @@ void wxBitmapButton::EndSelect() m_isSelected = FALSE; SetBitmap(); } +#endif +