/////////////////////////////////////////////////////////////////////////////
-// Name: button.cpp
+// Name: src/gtk1/button.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "button.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#if wxUSE_BUTTON
-#include "wx/button.h"
+#ifndef WX_PRECOMP
+ #include "wx/button.h"
+#endif
+
+#include "wx/stockitem.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
+#include "wx/gtk1/win_gtk.h"
//-----------------------------------------------------------------------------
// classes
// "clicked"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
if (g_isIdle)
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+ wxCommandEvent event(wxEVT_BUTTON, button->GetId());
event.SetEventObject(button);
- button->GetEventHandler()->ProcessEvent(event);
+ button->HandleWindowEvent(event);
+}
}
//-----------------------------------------------------------------------------
-// wxButton
+// "style_set" from m_widget
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+static gint
+gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ int left_border = 0;
+ int right_border = 0;
+ int top_border = 0;
+ int bottom_border = 0;
+
+ /* the default button has a border around it */
+ if (GTK_WIDGET_CAN_DEFAULT(m_widget))
+ {
+ left_border = 6;
+ right_border = 6;
+ top_border = 6;
+ bottom_border = 5;
+ win->DoMoveWindow( win->m_x-top_border,
+ win->m_y-left_border,
+ win->m_width+left_border+right_border,
+ win->m_height+top_border+bottom_border );
+ }
+
+ return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------
wxButton::wxButton()
{
const wxPoint &pos, const wxSize &size,
long style, 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("wxButton creation failed") );
- return FALSE;
+ return false;
}
-/*
- wxString label2( label );
- for (size_t i = 0; i < label2.Len(); i++)
- {
- if (label2.GetChar(i) == wxT('&'))
- label2.SetChar(i,wxT('_'));
- }
-
- GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
- gtk_widget_show( accel_label );
-
- m_widget = gtk_button_new();
- gtk_container_add( GTK_CONTAINER(m_widget), accel_label );
-
- gtk_accel_label_set_accel_widget( GTK_ACCEL_LABEL(accel_label), m_widget );
-
- guint accel_key = gtk_label_parse_uline (GTK_LABEL(accel_label), label2.mb_str() );
- gtk_accel_label_refetch( GTK_ACCEL_LABEL(accel_label) );
-
- wxControl::SetLabel( label );
-*/
-
-#ifdef __WXGTK20__
- m_widget = gtk_button_new_with_mnemonic("");
-#else
m_widget = gtk_button_new_with_label("");
-#endif
float x_alignment = 0.5;
if (HasFlag(wxBU_LEFT))
else if (HasFlag(wxBU_BOTTOM))
y_alignment = 1.0;
- gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
- x_alignment, y_alignment);
+ if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+ gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+ x_alignment, y_alignment);
- SetLabel( label );
+ SetLabel(label);
if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
- gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+ gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+ gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set",
+ GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this );
+
m_parent->DoAddChild( this );
PostCreation(size);
- return TRUE;
+ return true;
}
-void wxButton::SetDefault()
+
+wxWindow *wxButton::SetDefault()
{
- wxWindow *parent = GetParent();
- wxCHECK_RET( parent, _T("button without parent?") );
+ wxWindow *oldDefault = wxButtonBase::SetDefault();
- parent->SetDefaultItem(this);
-
GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
gtk_widget_grab_default( m_widget );
- SetSize( m_x, m_y, m_width, m_height );
+ // resize for default border
+ gtk_button_style_set_callback( m_widget, NULL, this );
+
+ return oldDefault;
}
/* static */
-wxSize wxButton::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize()
{
return wxSize(80,26);
}
-void wxButton::SetLabel( const wxString &label )
+void wxButton::SetLabel( const wxString &lbl )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
- wxControl::SetLabel( label );
+ wxString label(lbl);
-#ifdef __WXGTK20__
- wxString label2 = PrepareLabelMnemonics( label );
- gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) );
-#else
- gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
-#endif
+ if (label.empty() && wxIsStockID(m_windowId))
+ label = wxGetStockLabel(m_windowId);
+
+ wxControl::SetLabel(label);
+
+ const wxString labelGTK = GTKRemoveMnemonics(label);
- PostSetLabel();
+ gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK));
}
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
- return FALSE;
+ return false;
gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
- return TRUE;
+ return true;
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
{
-#ifdef __WXGTK20__
- return GTK_BUTTON(m_widget)->event_window;
-#else
return (window == m_widget->window);
-#endif
}
void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
}
-#ifndef __WXGTK20__
ret.x += 10; // add a few pixels for sloppy (but common) themes
-#endif
-
+
if (!HasFlag(wxBU_EXACTFIT))
{
- if (ret.x < 80) ret.x = 80;
+ wxSize defaultSize = GetDefaultSize();
+ if (ret.x < defaultSize.x) ret.x = defaultSize.x;
+ if (ret.y < defaultSize.y) ret.y = defaultSize.y;
}
+ CacheBestSize(ret);
return ret;
}
}
#endif // wxUSE_BUTTON
-
projects / wxWidgets.git / blobdiff