}
else if ( !win->m_hasFocus )
{
- win->m_hasFocus = TRUE;
+ win->m_hasFocus = true;
wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
event.SetEventObject( win );
// we might have lost the focus, but may be not - it may have just gone to
// another button in the same radiobox, so we'll check for it in the next
- // idle iteration (leave m_hasFocus == TRUE for now)
- win->m_lostFocus = TRUE;
+ // idle iteration (leave m_hasFocus == true for now)
+ win->m_lostFocus = true;
return FALSE;
}
void wxRadioBox::Init()
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_needParent = true;
+ m_acceptsFocus = true;
m_hasFocus =
- m_lostFocus = FALSE;
+ m_lostFocus = false;
+}
+
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
+ const wxString& title,
+ const wxPoint &pos, const wxSize &size,
+ const wxArrayString& choices, int majorDim,
+ long style, const wxValidator& validator,
+ const wxString &name )
+{
+ wxCArrayString chs(choices);
+
+ return Create( parent, id, title, pos, size, chs.GetCount(),
+ chs.GetStrings(), majorDim, style, validator, name );
}
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxRadioBox creation failed") );
- return FALSE;
+ return false;
}
m_widget = gtk_frame_new( wxGTK_CONV( title ) );
// assert here but just use the correct value for it
m_majorDim = majorDim == 0 ? n : majorDim;
+ int num_per_major = (n - 1) / m_majorDim +1;
+
+ int num_of_cols = 0;
+ int num_of_rows = 0;
+ if (HasFlag(wxRA_SPECIFY_COLS))
+ {
+ num_of_cols = m_majorDim;
+ num_of_rows = num_per_major;
+ }
+ else
+ {
+ num_of_cols = num_per_major;
+ num_of_rows = m_majorDim;
+ }
+
GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+ GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
+ gtk_table_set_col_spacings( GTK_TABLE(table), 1 );
+ gtk_table_set_row_spacings( GTK_TABLE(table), 1 );
+ gtk_widget_show( table );
+ gtk_container_add( GTK_CONTAINER(m_widget), table );
+
wxString label;
GSList *radio_button_group = (GSList *) NULL;
for (int i = 0; i < n; i++)
}
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) );
+ gtk_widget_show( GTK_WIDGET(m_radio) );
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 );
+ if (HasFlag(wxRA_SPECIFY_COLS))
+ {
+ int left = i%num_of_cols;
+ int right = (i%num_of_cols) + 1;
+ int top = i/num_of_cols;
+ int bottom = (i/num_of_cols)+1;
+ gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom,
+ GTK_FILL, GTK_FILL, 1, 1 );
+ }
+ else
+ {
+ int left = i/num_of_rows;
+ int right = (i/num_of_rows) + 1;
+ int top = i%num_of_rows;
+ int bottom = (i%num_of_rows)+1;
+ gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom,
+ GTK_FILL, GTK_FILL, 1, 1 );
+ }
+
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), "focus_out_event",
GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this );
-
- 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();
- InheritAttributes();
-
- ApplyWidgetStyle();
-
SetLabel( title );
- SetFont( parent->GetFont() );
-
- wxSize ls = LayoutItems();
-
- GtkRequisition req;
- req.width = 2;
- req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
- if (req.width > ls.x) ls.x = req.width;
-
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = ls.x;
- if (newSize.y == -1) newSize.y = ls.y;
- SetSize( newSize.x, newSize.y );
+ PostCreation(size);
- Show( TRUE );
-
- return TRUE;
+ return true;
}
wxRadioBox::~wxRadioBox()
}
}
-void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
- wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-
- LayoutItems();
-}
-
-wxSize wxRadioBox::LayoutItems()
-{
- int x = 7;
- int y = 15;
-
- if ( m_majorDim == 0 )
- {
- // avoid dividing by 0 below
- wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
-
- m_majorDim = 1;
- }
-
- int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
-
- wxSize res( 0, 0 );
-
- int num_of_cols = 0;
- int num_of_rows = 0;
- if (HasFlag(wxRA_SPECIFY_COLS))
- {
- 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;
- wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );
- for (int i1 = 0; i1< num_of_rows; i1++)
- {
- GtkWidget *button = GTK_WIDGET( node->GetData() );
-
- GtkRequisition req;
- req.width = 2;
- req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->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->GetNext();
- if (!node) break;
- }
-
- // we don't know the max_len before
-
- node = m_boxes.Item( j*num_of_rows );
- for (int i2 = 0; i2< num_of_rows; i2++)
- {
- GtkWidget *button = GTK_WIDGET( node->GetData() );
-
- gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
-
- node = node->GetNext();
- if (!node) break;
- }
-
- if (y > res.y) res.y = y;
-
- x += max_len + 2;
- }
-
- res.x = x+4;
- res.y += 4;
- }
- else
- {
- int max = 0;
-
- wxList::compatibility_iterator node = m_boxes.GetFirst();
- while (node)
- {
- GtkWidget *button = GTK_WIDGET( node->GetData() );
-
- GtkRequisition req;
- req.width = 2;
- req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )
- (button, &req );
-
- if (req.width > max) max = req.width;
-
- node = node->GetNext();
- }
-
- node = m_boxes.GetFirst();
- while (node)
- {
- GtkWidget *button = GTK_WIDGET( node->GetData() );
-
- gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
- x += max;
-
- node = node->GetNext();
- }
- res.x = x+4;
- res.y = 40;
- }
-
- return res;
-}
-
bool wxRadioBox::Show( bool show )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
if (!wxControl::Show(show))
{
// nothing to do
- return FALSE;
+ return false;
}
- if ((m_windowStyle & wxNO_BORDER) != 0)
+ if ( HasFlag(wxNO_BORDER) )
gtk_widget_hide( m_widget );
wxList::compatibility_iterator node = m_boxes.GetFirst();
node = node->GetNext();
}
- return TRUE;
+ return true;
}
int wxRadioBox::FindString( const wxString &find ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
int count = 0;
node = node->GetNext();
}
- return -1;
+ return wxNOT_FOUND;
}
void wxRadioBox::SetFocus()
int wxRadioBox::GetSelection(void) const
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
int count = 0;
wxFAIL_MSG( wxT("wxRadioBox none selected") );
- return -1;
+ return wxNOT_FOUND;
}
wxString wxRadioBox::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
wxList::compatibility_iterator node = m_boxes.Item( n );
- wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
+ wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
bool wxRadioBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
- return FALSE;
+ return false;
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
node = node->GetNext();
}
- return TRUE;
+ return true;
}
-void wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable( int item, bool enable )
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
wxList::compatibility_iterator node = m_boxes.Item( item );
- wxCHECK_RET( node, wxT("radiobox wrong index") );
+ wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
GtkButton *button = GTK_BUTTON( node->GetData() );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+ return true;
}
-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show( int item, bool show )
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
wxList::compatibility_iterator node = m_boxes.Item( item );
- wxCHECK_RET( node, wxT("radiobox wrong index") );
+ wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
GtkWidget *button = GTK_WIDGET( node->GetData() );
gtk_widget_show( button );
else
gtk_widget_hide( button );
+
+ return true;
}
wxString wxRadioBox::GetStringSelection() const
{
- wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
}
wxFAIL_MSG( wxT("wxRadioBox none selected") );
- return wxT("");
+ return wxEmptyString;
}
bool wxRadioBox::SetStringSelection( const wxString &s )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
int res = FindString( s );
- if (res == -1) return FALSE;
+ if (res == wxNOT_FOUND) return false;
SetSelection( res );
- return TRUE;
+ return true;
}
int wxRadioBox::GetCount() const
return m_boxes.GetCount();
}
-int wxRadioBox::GetNumberOfRowsOrCols() const
-{
- return 1;
-}
-
-void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
-{
- wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
-}
-
void wxRadioBox::GtkDisableEvents()
{
wxList::compatibility_iterator node = m_boxes.GetFirst();
}
}
-void wxRadioBox::ApplyWidgetStyle()
+void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
+ gtk_widget_modify_style( m_widget, style );
- gtk_widget_set_style( m_widget, m_widgetStyle );
+#ifdef __WXGTK20__
+ gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
{
GtkWidget *widget = GTK_WIDGET( node->GetData() );
- gtk_widget_set_style( widget, m_widgetStyle );
- gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle );
+ gtk_widget_modify_style( widget, style );
+ gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
node = node->GetNext();
}
bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
{
- if (window == m_widget->window) return TRUE;
+ if (window == m_widget->window) return true;
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
- if (window == button->window) return TRUE;
+ if (window == button->window) return true;
node = node->GetNext();
}
- return FALSE;
+ return false;
}
void wxRadioBox::OnInternalIdle()
{
if ( m_lostFocus )
{
- m_hasFocus = FALSE;
- m_lostFocus = FALSE;
+ m_hasFocus = false;
+ m_lostFocus = false;
wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
event.SetEventObject( this );
}
}
+// static
+wxVisualAttributes
+wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ wxVisualAttributes attr;
+ // NB: we need toplevel window so that GTK+ can find the right style
+ GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+ gtk_container_add(GTK_CONTAINER(wnd), widget);
+ attr = GetDefaultAttributesFromGTKWidget(widget);
+ gtk_widget_destroy(wnd);
+ return attr;
+}
+
+#if WXWIN_COMPATIBILITY_2_2
+
+int wxRadioBox::Number() const
+{
+ return GetCount();
+}
+
+wxString wxRadioBox::GetLabel(int n) const
+{
+ return GetString(n);
+}
+
+void wxRadioBox::SetLabel( int item, const wxString& label )
+{
+ SetString(item, label);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
#endif // wxUSE_RADIOBOX
projects / wxWidgets.git / blobdiff