X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abdeb9e7006488bf917d90048fcd0cbe22f44a71..ce22ac4592fccaedd8324e7a8f08b510748827e4:/src/gtk/bmpbuttn.cpp diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index 17bc64454f..656db887dc 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,15 +7,9 @@ // 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" @@ -28,13 +22,6 @@ class wxBitmapButton; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -45,6 +32,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button ) { if (g_isIdle) @@ -57,11 +45,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 +59,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 +73,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 +87,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 +101,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma button->EndSelect(); } +} //----------------------------------------------------------------------------- // wxBitmapButton @@ -115,7 +112,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) void wxBitmapButton::Init() { m_hasFocus = - m_isSelected = FALSE; + m_isSelected = false; } bool wxBitmapButton::Create( wxWindow *parent, @@ -127,20 +124,17 @@ 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 = - m_bmpDisabled = - m_bmpFocus = - m_bmpSelected = bitmap; + m_bmpNormal = bitmap; m_widget = gtk_button_new(); @@ -152,23 +146,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; + return true; } void wxBitmapButton::SetDefault() @@ -186,25 +181,20 @@ void wxBitmapButton::SetLabel( const wxString &label ) wxControl::SetLabel( label ); } -wxString wxBitmapButton::GetLabel() const +void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style) { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") ); - - return wxControl::GetLabel(); -} - -void wxBitmapButton::ApplyWidgetStyle() -{ - if ( !BUTTON_CHILD(m_widget) ) + if (!GTK_BIN(m_widget)->child) return; - wxButton::ApplyWidgetStyle(); + wxButton::DoApplyWidgetStyle(style); } void wxBitmapButton::OnSetBitmap() { wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); + InvalidateBestSize(); + wxBitmap the_one; if (!m_isEnabled) the_one = m_bmpDisabled; @@ -213,19 +203,7 @@ void wxBitmapButton::OnSetBitmap() 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; @@ -233,67 +211,67 @@ void wxBitmapButton::OnSetBitmap() 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; + + if (the_one.HasPixbuf()) + pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf()); + else + pixmap = gtk_image_new_from_pixmap(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); + 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); } } 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; - } - 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 -