// 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"
// "clicked"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (g_isIdle)
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;
button->HasFocus();
}
+}
//-----------------------------------------------------------------------------
// "leave"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->NotFocus();
}
+}
//-----------------------------------------------------------------------------
// "pressed"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->StartSelect();
}
+}
//-----------------------------------------------------------------------------
// "released"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->m_hasVMT) return;
button->EndSelect();
}
+}
//-----------------------------------------------------------------------------
// wxBitmapButton
void wxBitmapButton::Init()
{
m_hasFocus =
- m_isSelected = FALSE;
+ m_isSelected = false;
}
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();
-#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())
{
- 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();
}
- 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();
- InheritAttributes();
+ PostCreation(size);
- Show( TRUE );
-
- return TRUE;
+ return true;
}
void wxBitmapButton::SetDefault()
wxControl::SetLabel( label );
}
-wxString wxBitmapButton::GetLabel() const
-{
- wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
-
- return wxControl::GetLabel();
-}
-
-void wxBitmapButton::ApplyWidgetStyle()
+void wxBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
- 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;
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;
+
+ 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
+{
+ 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();
}
projects / wxWidgets.git / blobdiff