/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/bmpbuttn.cpp
+// Name: src/gtk/bmpbuttn.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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 <gtk/gtk.h>
//-----------------------------------------------------------------------------
// classes
class wxBitmapButton;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
// "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;
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->GTKMouseEnters();
+}
}
//-----------------------------------------------------------------------------
// "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->GTKMouseLeaves();
+}
}
//-----------------------------------------------------------------------------
// "pressed"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
- button->StartSelect();
+ button->GTKPressed();
+}
}
//-----------------------------------------------------------------------------
// "released"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
- button->EndSelect();
+ button->GTKReleased();
+}
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
+BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
+ EVT_SET_FOCUS(wxBitmapButton::OnFocusChange)
+ EVT_KILL_FOCUS(wxBitmapButton::OnFocusChange)
+END_EVENT_TABLE()
+
+
void wxBitmapButton::Init()
{
- m_hasFocus =
- m_isSelected = FALSE;
+ m_mouseHovers =
+ m_isPressed = false;
}
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();
+ g_object_ref(m_widget);
if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
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 )
wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
wxControl::SetLabel( label );
- PostSetLabel();
-}
-
-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);
{
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)
+ else if (m_isPressed)
the_one = m_bmpSelected;
- else if (m_hasFocus)
+ else if (m_mouseHovers)
+ the_one = m_bmpHover;
+ else if (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;
+ the_one = m_bmpNormal;
- GdkBitmap *mask = (GdkBitmap *) NULL;
- if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
+ if (!the_one.Ok())
+ the_one = m_bmpNormal;
+ if (!the_one.Ok())
+ return;
- GtkWidget *child = BUTTON_CHILD(m_widget);
- if (child == NULL)
+ GtkWidget* image = GTK_BIN(m_widget)->child;
+ if (image == 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);
+ image = gtk_image_new();
+ gtk_widget_show(image);
+ gtk_container_add(GTK_CONTAINER(m_widget), image);
}
+ // always use pixbuf, because pixmap mask does not
+ // work with disabled images in some themes
+ gtk_image_set_from_pixbuf(GTK_IMAGE(image), 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;
- }
- 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()
+void wxBitmapButton::GTKMouseEnters()
{
- m_hasFocus = TRUE;
+ m_mouseHovers = true;
OnSetBitmap();
}
-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKMouseLeaves()
{
- m_hasFocus = FALSE;
+ m_mouseHovers = false;
OnSetBitmap();
}
-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKPressed()
{
- m_isSelected = TRUE;
+ m_isPressed = true;
OnSetBitmap();
}
-void wxBitmapButton::EndSelect()
+void wxBitmapButton::GTKReleased()
{
- m_isSelected = FALSE;
+ m_isPressed = false;
OnSetBitmap();
}
-#endif // wxUSE_BMPBUTTON
+void wxBitmapButton::OnFocusChange(wxFocusEvent& event)
+{
+ event.Skip();
+ OnSetBitmap();
+}
+#endif // wxUSE_BMPBUTTON
projects / wxWidgets.git / blobdiff