X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..65fd2fc2616552e4204223b7c2b69d9bc87c1f2d:/src/gtk/bmpbuttn.cpp?ds=sidebyside diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index 34f5bab890..3130b8d23c 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/bmpbuttn.cpp +// Name: src/gtk/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 //----------------------------------------------------------------------------- // classes @@ -28,13 +22,6 @@ class wxBitmapButton; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -45,11 +32,9 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!button->m_hasVMT) return; if (g_blockEventsOnDrag) return; @@ -57,11 +42,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; @@ -69,11 +56,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; @@ -81,11 +70,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; @@ -93,11 +84,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,6 +98,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma button->EndSelect(); } +} //----------------------------------------------------------------------------- // wxBitmapButton @@ -115,7 +109,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) void wxBitmapButton::Init() { m_hasFocus = - m_isSelected = FALSE; + m_isSelected = false; } bool wxBitmapButton::Create( wxWindow *parent, @@ -127,20 +121,14 @@ bool wxBitmapButton::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - 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 = - m_bmpDisabled = - m_bmpFocus = - m_bmpSelected = bitmap; + m_bmpNormal = bitmap; m_widget = gtk_button_new(); @@ -152,31 +140,24 @@ bool wxBitmapButton::Create( wxWindow *parent, OnSetBitmap(); } - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this ); + g_signal_connect_after (m_widget, "clicked", + G_CALLBACK (gtk_bmpbutton_clicked_callback), + this); - 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_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this ); - 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_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this ); + g_signal_connect (m_widget, "enter", + G_CALLBACK (gtk_bmpbutton_enter_callback), this); + g_signal_connect (m_widget, "leave", + G_CALLBACK (gtk_bmpbutton_leave_callback), this); + g_signal_connect (m_widget, "pressed", + G_CALLBACK (gtk_bmpbutton_press_callback), this); + g_signal_connect (m_widget, "released", + G_CALLBACK (gtk_bmpbutton_release_callback), this); m_parent->DoAddChild( this ); 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 ) @@ -186,16 +167,9 @@ 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) ) + if (!GTK_BIN(m_widget)->child) return; wxButton::DoApplyWidgetStyle(style); @@ -206,97 +180,74 @@ void wxBitmapButton::OnSetBitmap() wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); InvalidateBestSize(); - + wxBitmap the_one; - if (!m_isEnabled) + if (!IsThisEnabled()) 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; - } - } + the_one = m_bmpNormal; 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(); - - GtkWidget *child = BUTTON_CHILD(m_widget); + GtkWidget *child = GTK_BIN(m_widget)->child; if (child == NULL) { // initial bitmap - GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); + GtkWidget *pixmap = + gtk_image_new_from_pixbuf(the_one.GetPixbuf()); + 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); + GtkImage *pixmap = GTK_IMAGE(child); + gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf()); } } wxSize wxBitmapButton::DoGetBestSize() const { - 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; + return wxControl::DoGetBestSize(); } bool wxBitmapButton::Enable( bool enable ) { if ( !wxWindow::Enable(enable) ) - return FALSE; + return false; OnSetBitmap(); - return TRUE; + return true; } void wxBitmapButton::HasFocus() { - m_hasFocus = TRUE; + m_hasFocus = true; OnSetBitmap(); } void wxBitmapButton::NotFocus() { - 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 -