/////////////////////////////////////////////////////////////////////////////
-// Name: button.cpp
+// Name: src/gtk/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/gtk/win_gtk.h"
//-----------------------------------------------------------------------------
// classes
class wxButton;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern "C" {
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
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))
{
-#ifdef __WXGTK20__
GtkBorder *default_border = NULL;
gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
if (default_border)
right_border += default_border->right;
top_border += default_border->top;
bottom_border += default_border->bottom;
- g_free( default_border );
+ gtk_border_free( default_border );
}
-#else
- left_border = 6;
- right_border = 6;
- top_border = 6;
- bottom_border = 5;
-#endif
- 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 );
- }
+ win->MoveWindow(
+ win->m_x - left_border,
+ win->m_y - top_border,
+ win->m_width + left_border + right_border,
+ win->m_height + top_border + bottom_border);
+ }
return FALSE;
}
{
}
-bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
- const wxPoint &pos, const wxSize &size,
- long style, const wxValidator& validator, const wxString &name )
+bool wxButton::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxString &label,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ 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("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
#endif
{
- if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
- gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+ if (GTK_IS_MISC(GTK_BIN(m_widget)->child))
+ gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child),
x_alignment, y_alignment);
}
if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
- gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
- GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+ g_signal_connect_after (m_widget, "clicked",
+ G_CALLBACK (gtk_button_clicked_callback),
+ this);
+
+ g_signal_connect_after (m_widget, "style_set",
+ G_CALLBACK (gtk_button_style_set_callback),
+ 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;
}
-
-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 );
-
+
// resize for default border
gtk_button_style_set_callback( m_widget, NULL, this );
+
+ return oldDefault;
}
/* static */
wxSize wxButtonBase::GetDefaultSize()
{
-#ifdef __WXGTK20__
static wxSize size = wxDefaultSize;
if (size == wxDefaultSize)
{
size.x = wxMax(minwidth, req.width);
size.y = wxMax(minheight, req.height);
-
+
gtk_widget_destroy(wnd);
}
return size;
-#else
- return wxSize(80,26);
-#endif
}
void wxButton::SetLabel( const wxString &lbl )
wxControl::SetLabel(label);
-#ifdef __WXGTK20__
+ const wxString labelGTK = GTKConvertMnemonics(label);
+
if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
{
const char *stock = wxGetStockGtkID(m_windowId);
}
}
- wxString label2 = PrepareLabelMnemonics(label);
- gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
+ gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(labelGTK));
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
-
+
ApplyWidgetStyle( false );
-
-#else
- gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel()));
-#endif
}
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
- return FALSE;
+ return false;
- gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+ gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
- return TRUE;
+ return true;
}
-bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
-#ifdef __WXGTK20__
return GTK_BUTTON(m_widget)->event_window;
-#else
- return (window == m_widget->window);
-#endif
}
void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
- gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+ gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
wxSize wxButton::DoGetBestSize() const
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))
{
wxSize defaultSize = GetDefaultSize();
}
#endif // wxUSE_BUTTON
-
projects / wxWidgets.git / blobdiff