Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added SetString(), deprecated SetLabel()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-17 19:14:54 +00:00
parent bcebad81f1
commit 2da6105611
2 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/radiobox.cpp
View File

@@ -92,16 +92,16 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
(gdk_event->keyval == GDK_Left)) (gdk_event->keyval == GDK_Left))
{ {
if (node == rb->m_boxes.First()) if (node == rb->m_boxes.First())
node = rb->m_boxes.Last(); node = rb->m_boxes.Last();
else else
node = node->Previous(); node = node->Previous();
} }
else else
{ {
if (node == rb->m_boxes.Last()) if (node == rb->m_boxes.Last())
node = rb->m_boxes.First(); node = rb->m_boxes.First();
else else
node = node->Next(); node = node->Next();
} }
GtkWidget *button = (GtkWidget*) node->Data(); GtkWidget *button = (GtkWidget*) node->Data();
@@ -526,7 +526,7 @@ void wxRadioBox::SetLabel( const wxString& label )
gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() ); gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
} }
void wxRadioBox::SetLabel( int item, const wxString& label ) void wxRadioBox::SetString( int item, const wxString& label )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
@@ -540,11 +540,6 @@ void wxRadioBox::SetLabel( int item, const wxString& label )
gtk_label_set( g_label, label.mbc_str() ); gtk_label_set( g_label, label.mbc_str() );
} }
void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
{
wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
}
bool wxRadioBox::Enable( bool enable ) bool wxRadioBox::Enable( bool enable )
{ {
if ( !wxControl::Enable( enable ) ) if ( !wxControl::Enable( enable ) )
@@ -624,7 +619,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
return TRUE; return TRUE;
} }
int wxRadioBox::Number() const int wxRadioBox::GetCount() const
{ {
return m_boxes.Number(); return m_boxes.Number();
} }
@@ -647,7 +642,7 @@ void wxRadioBox::GtkDisableEvents()
gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
node = node->Next(); node = node->Next();
} }
} }
@@ -659,7 +654,7 @@ void wxRadioBox::GtkEnableEvents()
gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
node = node->Next(); node = node->Next();
} }
} }

25
src/gtk1/radiobox.cpp
View File

@@ -92,16 +92,16 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
(gdk_event->keyval == GDK_Left)) (gdk_event->keyval == GDK_Left))
{ {
if (node == rb->m_boxes.First()) if (node == rb->m_boxes.First())
node = rb->m_boxes.Last(); node = rb->m_boxes.Last();
else else
node = node->Previous(); node = node->Previous();
} }
else else
{ {
if (node == rb->m_boxes.Last()) if (node == rb->m_boxes.Last())
node = rb->m_boxes.First(); node = rb->m_boxes.First();
else else
node = node->Next(); node = node->Next();
} }
GtkWidget *button = (GtkWidget*) node->Data(); GtkWidget *button = (GtkWidget*) node->Data();
@@ -526,7 +526,7 @@ void wxRadioBox::SetLabel( const wxString& label )
gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() ); gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel().mbc_str() );
} }
void wxRadioBox::SetLabel( int item, const wxString& label ) void wxRadioBox::SetString( int item, const wxString& label )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
@@ -540,11 +540,6 @@ void wxRadioBox::SetLabel( int item, const wxString& label )
gtk_label_set( g_label, label.mbc_str() ); gtk_label_set( g_label, label.mbc_str() );
} }
void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
{
wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented."));
}
bool wxRadioBox::Enable( bool enable ) bool wxRadioBox::Enable( bool enable )
{ {
if ( !wxControl::Enable( enable ) ) if ( !wxControl::Enable( enable ) )
@@ -624,7 +619,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
return TRUE; return TRUE;
} }
int wxRadioBox::Number() const int wxRadioBox::GetCount() const
{ {
return m_boxes.Number(); return m_boxes.Number();
} }
@@ -647,7 +642,7 @@ void wxRadioBox::GtkDisableEvents()
gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()),
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
node = node->Next(); node = node->Next();
} }
} }
@@ -659,7 +654,7 @@ void wxRadioBox::GtkEnableEvents()
gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
node = node->Next(); node = node->Next();
} }
} }