X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29006414014249ec3eb86e9c13da7f06b2741e3a..8dbf458911c24bae120bed07d5627a65f362b8d1:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index c0d0f9202d..7d2f23a120 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -12,6 +12,9 @@ #endif #include "wx/radiobox.h" + +#if wxUSE_RADIOBOX + #include "wx/dialog.h" #include "wx/frame.h" @@ -19,6 +22,13 @@ #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -31,7 +41,9 @@ extern bool g_blockEventsOnDrag; static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb ) { - if (!rb->HasVMT()) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; if (rb->m_alreadySent) @@ -59,7 +71,7 @@ BEGIN_EVENT_TABLE(wxRadioBox, wxControl) EVT_SIZE(wxRadioBox::OnSize) END_EVENT_TABLE() -wxRadioBox::wxRadioBox(void) +wxRadioBox::wxRadioBox() { } @@ -75,9 +87,11 @@ 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 ); + m_widget = gtk_frame_new( title.mbc_str() ); m_majorDim = majorDim; @@ -88,7 +102,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, { if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); - m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) ); + m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) ); m_boxes.Append( (wxObject*) m_radio ); @@ -99,8 +113,9 @@ 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), m_x+10, m_y+10+(i*24) ); - + gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), + GTK_WIDGET(m_radio), + m_x+10, m_y+10+(i*24), 10, 10 ); } wxSize ls = LayoutItems(); @@ -110,9 +125,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if (newSize.y == -1) newSize.y = ls.y; SetSize( newSize.x, newSize.y ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -127,7 +140,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, return TRUE; } -wxRadioBox::~wxRadioBox(void) +wxRadioBox::~wxRadioBox() { wxNode *node = m_boxes.First(); while (node) @@ -140,9 +153,9 @@ wxRadioBox::~wxRadioBox(void) void wxRadioBox::OnSize( wxSizeEvent &event ) { - wxControl::OnSize( event ); - LayoutItems(); + + event.Skip(); } wxSize wxRadioBox::LayoutItems() @@ -172,7 +185,7 @@ wxSize wxRadioBox::LayoutItems() if (len > max_len) max_len = len; gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y ); - y += 20; + y += 22; node = node->Next(); if (!node) break; @@ -185,7 +198,7 @@ wxSize wxRadioBox::LayoutItems() { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_widget_set_usize( button, max_len, 20 ); + gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 ); node = node->Next(); if (!node) break; @@ -221,9 +234,8 @@ wxSize wxRadioBox::LayoutItems() { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y ); + gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); x += max; - gtk_widget_set_usize( button, max, 20 ); node = node->Next(); } @@ -236,10 +248,13 @@ wxSize wxRadioBox::LayoutItems() bool wxRadioBox::Show( bool show ) { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") ); wxWindow::Show( show ); + if ((m_windowStyle & wxNO_BORDER) != 0) + gtk_widget_hide( m_widget ); + wxNode *node = m_boxes.First(); while (node) { @@ -255,7 +270,7 @@ bool wxRadioBox::Show( bool show ) int wxRadioBox::FindString( const wxString &s ) const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") ); int count = 0; @@ -276,7 +291,7 @@ int wxRadioBox::FindString( const wxString &s ) const void wxRadioBox::SetFocus() { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); if (m_boxes.GetCount() == 0) return; @@ -297,11 +312,11 @@ void wxRadioBox::SetFocus() void wxRadioBox::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); wxNode *node = m_boxes.Nth( n ); - wxCHECK_RET( node, "radiobox wrong index" ); + wxCHECK_RET( node, _T("radiobox wrong index") ); GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); @@ -310,7 +325,7 @@ void wxRadioBox::SetSelection( int n ) int wxRadioBox::GetSelection(void) const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, -1, _T("invalid radiobox") ); int count = 0; @@ -323,18 +338,18 @@ int wxRadioBox::GetSelection(void) const node = node->Next(); } - wxFAIL_MSG( "wxRadioBox none selected" ); + wxFAIL_MSG( _T("wxRadioBox none selected") ); return -1; } wxString wxRadioBox::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); wxNode *node = m_boxes.Nth( n ); - wxCHECK_MSG( node, "", "radiobox wrong index" ); + wxCHECK_MSG( node, _T(""), _T("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->Data() ); GtkLabel *label = GTK_LABEL( button->child ); @@ -344,42 +359,43 @@ wxString wxRadioBox::GetString( int n ) const wxString wxRadioBox::GetLabel( int item ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); return GetString( item ); } void wxRadioBox::SetLabel( const wxString& label ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); wxControl::SetLabel( label ); - gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel() ); + gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() ); } void wxRadioBox::SetLabel( int item, const wxString& label ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); wxNode *node = m_boxes.Nth( item ); - wxCHECK_RET( node, "radiobox wrong index" ); + wxCHECK_RET( node, _T("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->Data() ); GtkLabel *g_label = GTK_LABEL( button->child ); - gtk_label_set( g_label, label ); + gtk_label_set( g_label, label.mbc_str() ); } void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) ) { - wxFAIL_MSG("wxRadioBox::SetLabel not implemented."); + wxFAIL_MSG(_T("wxRadioBox::SetLabel not implemented.")); } -void wxRadioBox::Enable( bool enable ) +bool wxRadioBox::Enable( bool enable ) { - wxControl::Enable( enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; wxNode *node = m_boxes.First(); while (node) @@ -390,15 +406,17 @@ void wxRadioBox::Enable( bool enable ) gtk_widget_set_sensitive( label, enable ); node = node->Next(); } + + return TRUE; } void wxRadioBox::Enable( int item, bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); wxNode *node = m_boxes.Nth( item ); - wxCHECK_RET( node, "radiobox wrong index" ); + wxCHECK_RET( node, _T("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->Data() ); GtkWidget *label = button->child; @@ -408,11 +426,11 @@ void wxRadioBox::Enable( int item, bool enable ) void wxRadioBox::Show( int item, bool show ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid radiobox") ); wxNode *node = m_boxes.Nth( item ); - wxCHECK_RET( node, "radiobox wrong index" ); + wxCHECK_RET( node, _T("radiobox wrong index") ); GtkWidget *button = GTK_WIDGET( node->Data() ); @@ -424,7 +442,7 @@ void wxRadioBox::Show( int item, bool show ) wxString wxRadioBox::GetStringSelection(void) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid radiobox") ); wxNode *node = m_boxes.First(); while (node) @@ -438,13 +456,13 @@ wxString wxRadioBox::GetStringSelection(void) const node = node->Next(); } - wxFAIL_MSG( "wxRadioBox none selected" ); - return ""; + wxFAIL_MSG( _T("wxRadioBox none selected") ); + return _T(""); } bool wxRadioBox::SetStringSelection( const wxString &s ) { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobox") ); int res = FindString( s ); if (res == -1) return FALSE; @@ -465,7 +483,7 @@ int wxRadioBox::GetNumberOfRowsOrCols(void) const void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) { - wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented."); + wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); } void wxRadioBox::ApplyWidgetStyle() @@ -503,3 +521,5 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) return FALSE; } + +#endif