X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..b62c3631c9d769f3cd8e85c0f1298d9f09a919d2:/src/gtk1/radiobox.cpp diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index e677deb968..3e2dc3124c 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -87,7 +87,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, PreCreation( parent, id, pos, size, style, name ); +#if wxUSE_VALIDATORS SetValidator( validator ); +#endif m_widget = gtk_frame_new( title.mbc_str() ); @@ -111,8 +113,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), - GTK_WIDGET(m_radio), + gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), + GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24), 10, 10 ); } @@ -161,6 +163,14 @@ wxSize wxRadioBox::LayoutItems() int x = 7; int y = 15; + if ( m_majorDim == 0 ) + { + // avoid dividing by 0 below + wxFAIL_MSG( "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 ); @@ -252,7 +262,7 @@ bool wxRadioBox::Show( bool show ) if ((m_windowStyle & wxNO_BORDER) != 0) gtk_widget_hide( m_widget ); - + wxNode *node = m_boxes.First(); while (node) {