}
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,
!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 ) );
m_parent->DoAddChild( this );
- PostCreation();
- InheritAttributes();
-
- ApplyWidgetStyle();
+ bool wasShown = IsShown();
+ if ( wasShown )
+ Hide(); // prevent PostCreation() from showing us
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 );
+ if ( wasShown )
+ Show();
- return TRUE;
+ return true;
}
wxRadioBox::~wxRadioBox()
{
wxWindow::DoSetSize( x, y, width, height, sizeFlags );
- LayoutItems();
+ LayoutItems(false);
}
-wxSize wxRadioBox::LayoutItems()
+wxSize wxRadioBox::DoGetBestSize() const
{
- int x = 7;
- int y = 15;
+ wxSize size = LayoutItems(true);
- if ( m_majorDim == 0 )
- {
- // avoid dividing by 0 below
- wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
+ 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 > size.x)
+ size.x = req.width;
- m_majorDim = 1;
- }
+ CacheBestSize(size);
+ return size;
+}
+
+wxSize wxRadioBox::LayoutItems(bool justCalc) const
+{
+ wxSize res( 0, 0 );
+
+ // avoid dividing by 0 below
+ wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
- wxSize res( 0, 0 );
+ int x = 7;
+ int y = 15;
int num_of_cols = 0;
int num_of_rows = 0;
num_of_cols = num_per_major;
num_of_rows = m_majorDim;
}
-
- int lineheight = GetCharHeight();
-
+
+ int lineheight = GetCharHeight()+2;
+
if ( HasFlag(wxRA_SPECIFY_COLS) ||
(HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
{
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 );
+ if ( !justCalc )
+ gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += req.height;
node = node->GetNext();
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
- gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
+ if ( !justCalc )
+ gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
node = node->GetNext();
if (!node) break;
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
- gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
+ if ( !justCalc )
+ gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
x += max;
node = node->GetNext();
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
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::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 == -1) 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