#include "wx/dialog.h"
#include "wx/frame.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
#include "wx/gtk/win_gtk.h"
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
// "clicked"
rb->GetEventHandler()->ProcessEvent(event);
}
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ if (!rb->m_hasVMT) return FALSE;
+ if (g_blockEventsOnDrag) return FALSE;
+
+ if ((gdk_event->keyval != GDK_Up) &&
+ (gdk_event->keyval != GDK_Down) &&
+ (gdk_event->keyval != GDK_Left) &&
+ (gdk_event->keyval != GDK_Right))
+ {
+ return FALSE;
+ }
+
+ wxNode *node = rb->m_boxes.Find( (wxObject*) widget );
+ if (!node)
+ {
+ return FALSE;
+ }
+
+ gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+
+ if ((gdk_event->keyval == GDK_Up) ||
+ (gdk_event->keyval == GDK_Left))
+ {
+ if (node == rb->m_boxes.First())
+ node = rb->m_boxes.Last();
+ else
+ node = node->Previous();
+ }
+ else
+ {
+ if (node == rb->m_boxes.Last())
+ node = rb->m_boxes.First();
+ else
+ node = node->Next();
+ }
+
+ GtkWidget *button = (GtkWidget*) node->Data();
+
+ gtk_widget_grab_focus( button );
+
+ return TRUE;
+}
+
//-----------------------------------------------------------------------------
// wxRadioBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
-BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
- EVT_SIZE(wxRadioBox::OnSize)
-END_EVENT_TABLE()
-
wxRadioBox::wxRadioBox()
{
}
m_needParent = TRUE;
m_acceptsFocus = TRUE;
- PreCreation( parent, id, pos, size, style, name );
-
-#if wxUSE_VALIDATORS
- SetValidator( validator );
-#endif
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxRadioBox creation failed") );
+ return FALSE;
+ }
m_widget = gtk_frame_new( title.mbc_str() );
GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+ wxString label;
GSList *radio_button_group = (GSList *) NULL;
for (int i = 0; i < n; i++)
{
- if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+ if ( i != 0 )
+ radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+
+ label.Empty();
+ for ( const wxChar *pc = choices[i]; *pc; pc++ )
+ {
+ if ( *pc != wxT('&') )
+ label += *pc;
+ }
- m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) );
+ m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) );
+ gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event",
+ GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this );
+
m_boxes.Append( (wxObject*) m_radio );
ConnectWidget( GTK_WIDGET(m_radio) );
if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
- GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+ GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
- gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
+ gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow),
GTK_WIDGET(m_radio),
m_x+10, m_y+10+(i*24), 10, 10 );
}
+ m_parent->DoAddChild( this );
+
+ PostCreation();
+
+ ApplyWidgetStyle();
+
+ SetLabel( title );
+
+ SetFont( parent->GetFont() );
+
wxSize ls = LayoutItems();
wxSize newSize = size;
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
- m_parent->DoAddChild( this );
-
- PostCreation();
-
- SetLabel( title );
-
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
Show( TRUE );
}
}
-void wxRadioBox::OnSize( wxSizeEvent &event )
+void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
+ wxWindow::DoSetSize( x, y, width, height, sizeFlags );
+
LayoutItems();
-
- event.Skip();
}
wxSize wxRadioBox::LayoutItems()
if ( m_majorDim == 0 )
{
// avoid dividing by 0 below
- wxFAIL_MSG( _T("dimension of radiobox should not be 0!") );
+ wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
m_majorDim = 1;
}
wxSize res( 0, 0 );
- if (m_windowStyle & wxRA_HORIZONTAL)
+ int num_of_cols = 0;
+ int num_of_rows = 0;
+ if (HasFlag(wxRA_SPECIFY_COLS))
{
-
- for (int j = 0; j < m_majorDim; j++)
+ num_of_cols = m_majorDim;
+ num_of_rows = num_per_major;
+ }
+ else
+ {
+ num_of_cols = num_per_major;
+ num_of_rows = m_majorDim;
+ }
+
+ if ( HasFlag(wxRA_SPECIFY_COLS) ||
+ (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
+ {
+ for (int j = 0; j < num_of_cols; j++)
{
y = 15;
int max_len = 0;
- wxNode *node = m_boxes.Nth( j*num_per_major );
- for (int i1 = 0; i1< num_per_major; i1++)
+ wxNode *node = m_boxes.Nth( j*num_of_rows );
+ for (int i1 = 0; i1< num_of_rows; i1++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
- GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
- GdkFont *font = m_widget->style->font;
- int len = 22+gdk_string_measure( font, label->label );
- if (len > max_len) max_len = len;
-
- gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
- y += 22;
+
+ GtkRequisition req;
+ req.width = 2;
+ req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+ (button, &req );
+
+ if (req.width > max_len) max_len = req.width;
+
+ gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
+ y += req.height;
node = node->Next();
if (!node) break;
// we don't know the max_len before
- node = m_boxes.Nth( j*num_per_major );
- for (int i2 = 0; i2< num_per_major; i2++)
+ node = m_boxes.Nth( j*num_of_rows );
+ for (int i2 = 0; i2< num_of_rows; i2++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
- gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );
+ gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
node = node->Next();
if (!node) break;
}
res.x = x+4;
- res.y += 9;
+ res.y += 4;
}
else
{
wxNode *node = m_boxes.First();
while (node)
{
- GtkButton *button = GTK_BUTTON( node->Data() );
- GtkLabel *label = GTK_LABEL( button->child );
+ GtkWidget *button = GTK_WIDGET( node->Data() );
+
+ GtkRequisition req;
+ req.width = 2;
+ req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+ (button, &req );
- GdkFont *font = m_widget->style->font;
- int len = 22+gdk_string_measure( font, label->label );
- if (len > max) max = len;
+ if (req.width > max) max = req.width;
node = node->Next();
}
{
GtkWidget *button = GTK_WIDGET( node->Data() );
- gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
+ gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
x += max;
node = node->Next();
}
res.x = x+4;
- res.y = 42;
+ res.y = 40;
}
return res;
bool wxRadioBox::Show( bool show )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
- wxWindow::Show( show );
+ if (!wxControl::Show(show))
+ {
+ // nothing to do
+ return FALSE;
+ }
if ((m_windowStyle & wxNO_BORDER) != 0)
gtk_widget_hide( m_widget );
int wxRadioBox::FindString( const wxString &s ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
int count = 0;
void wxRadioBox::SetFocus()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
if (m_boxes.GetCount() == 0) return;
if (button->active)
{
gtk_widget_grab_focus( GTK_WIDGET(button) );
-
return;
}
node = node->Next();
void wxRadioBox::SetSelection( int n )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxNode *node = m_boxes.Nth( n );
- wxCHECK_RET( node, _T("radiobox wrong index") );
+ wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
- DisableEvents();
+ GtkDisableEvents();
gtk_toggle_button_set_state( button, 1 );
- EnableEvents();
+ GtkEnableEvents();
}
int wxRadioBox::GetSelection(void) const
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
int count = 0;
node = node->Next();
}
- wxFAIL_MSG( _T("wxRadioBox none selected") );
+ wxFAIL_MSG( wxT("wxRadioBox none selected") );
return -1;
}
wxString wxRadioBox::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
wxNode *node = m_boxes.Nth( n );
- wxCHECK_MSG( node, _T(""), _T("radiobox wrong index") );
+ wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *label = GTK_LABEL( button->child );
wxString wxRadioBox::GetLabel( int item ) const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
return GetString( item );
}
void wxRadioBox::SetLabel( const wxString& label )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxControl::SetLabel( label );
void wxRadioBox::SetLabel( int item, const wxString& label )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxNode *node = m_boxes.Nth( item );
- wxCHECK_RET( node, _T("radiobox wrong index") );
+ wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *g_label = GTK_LABEL( button->child );
void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
{
- wxFAIL_MSG(_T("wxRadioBox::SetLabel not implemented."));
+ wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
}
bool wxRadioBox::Enable( bool enable )
void wxRadioBox::Enable( int item, bool enable )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxNode *node = m_boxes.Nth( item );
- wxCHECK_RET( node, _T("radiobox wrong index") );
+ wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkWidget *label = button->child;
void wxRadioBox::Show( int item, bool show )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
wxNode *node = m_boxes.Nth( item );
- wxCHECK_RET( node, _T("radiobox wrong index") );
+ wxCHECK_RET( node, wxT("radiobox wrong index") );
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_widget_hide( button );
}
-wxString wxRadioBox::GetStringSelection(void) const
+wxString wxRadioBox::GetStringSelection() const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
wxNode *node = m_boxes.First();
while (node)
node = node->Next();
}
- wxFAIL_MSG( _T("wxRadioBox none selected") );
- return _T("");
+ wxFAIL_MSG( wxT("wxRadioBox none selected") );
+ return wxT("");
}
bool wxRadioBox::SetStringSelection( const wxString &s )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
int res = FindString( s );
if (res == -1) return FALSE;
return TRUE;
}
-int wxRadioBox::Number(void) const
+int wxRadioBox::Number() const
{
return m_boxes.Number();
}
-int wxRadioBox::GetNumberOfRowsOrCols(void) const
+int wxRadioBox::GetNumberOfRowsOrCols() const
{
return 1;
}
void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
{
- wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
+ wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
}
-void wxRadioBox::DisableEvents()
+void wxRadioBox::GtkDisableEvents()
{
wxNode *node = m_boxes.First();
while (node)
}
}
-void wxRadioBox::EnableEvents()
+void wxRadioBox::GtkEnableEvents()
{
wxNode *node = m_boxes.First();
while (node)
}
}
+#if wxUSE_TOOLTIPS
+void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+{
+ wxNode *node = m_boxes.First();
+ while (node)
+ {
+ GtkWidget *widget = GTK_WIDGET( node->Data() );
+ gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+ node = node->Next();
+ }
+}
+#endif // wxUSE_TOOLTIPS
+
bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
{
if (window == m_widget->window) return TRUE;
projects / wxWidgets.git / blobdiff