X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3417c2cd3d5cb05451270b5a09fe2355406158a3..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk1/radiobox.cpp diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index dcd089fa7e..05dde830a4 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -20,6 +20,7 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- @@ -33,7 +34,7 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // "clicked" @@ -67,10 +68,6 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) -BEGIN_EVENT_TABLE(wxRadioBox, wxControl) - EVT_SIZE(wxRadioBox::OnSize) -END_EVENT_TABLE() - wxRadioBox::wxRadioBox() { } @@ -88,7 +85,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( _T("wxRadioBox creation failed") ); + wxFAIL_MSG( wxT("wxRadioBox creation failed") ); return FALSE; } @@ -108,7 +105,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, label.Empty(); for ( const wxChar *pc = choices[i]; *pc; pc++ ) { - if ( *pc != _T('&') ) + if ( *pc != wxT('&') ) label += *pc; } @@ -121,9 +118,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, 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 ); } @@ -161,11 +158,11 @@ wxRadioBox::~wxRadioBox() } } -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() @@ -176,7 +173,7 @@ 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; } @@ -215,7 +212,7 @@ wxSize wxRadioBox::LayoutItems() 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 ); + gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); y += 22; node = node->Next(); @@ -229,7 +226,7 @@ wxSize wxRadioBox::LayoutItems() { 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; @@ -265,7 +262,7 @@ wxSize wxRadioBox::LayoutItems() { 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(); @@ -279,9 +276,13 @@ wxSize wxRadioBox::LayoutItems() 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 ); @@ -301,7 +302,7 @@ bool wxRadioBox::Show( bool show ) 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; @@ -322,7 +323,7 @@ int wxRadioBox::FindString( const wxString &s ) const 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; @@ -333,7 +334,6 @@ void wxRadioBox::SetFocus() if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); - return; } node = node->Next(); @@ -343,11 +343,11 @@ void wxRadioBox::SetFocus() 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() ); @@ -360,7 +360,7 @@ void wxRadioBox::SetSelection( int n ) 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; @@ -373,18 +373,18 @@ int wxRadioBox::GetSelection(void) const 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 ); @@ -394,14 +394,14 @@ wxString wxRadioBox::GetString( int n ) const 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 ); @@ -410,11 +410,11 @@ void wxRadioBox::SetLabel( const wxString& 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 ); @@ -424,7 +424,7 @@ void wxRadioBox::SetLabel( int item, const wxString& label ) 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 ) @@ -447,11 +447,11 @@ 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; @@ -461,11 +461,11 @@ void wxRadioBox::Enable( int item, bool enable ) 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() ); @@ -475,9 +475,9 @@ void wxRadioBox::Show( int item, bool show ) 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) @@ -491,13 +491,13 @@ wxString wxRadioBox::GetStringSelection(void) const 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; @@ -506,19 +506,19 @@ bool wxRadioBox::SetStringSelection( const wxString &s ) 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()