Lots of updates for Unicode and GTK 2.0 support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -109,10 +109,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
||||
|
||||
SetLabel( label );
|
||||
|
||||
#if (GTK_MINOR_VERSION > 0)
|
||||
if (style & wxNO_BORDER)
|
||||
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
|
||||
#endif
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
|
||||
GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
|
||||
@@ -162,7 +160,7 @@ void wxButton::SetLabel( const wxString &label )
|
||||
|
||||
wxControl::SetLabel( label );
|
||||
|
||||
gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), GetLabel().mbc_str() );
|
||||
gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
|
||||
}
|
||||
|
||||
bool wxButton::Enable( bool enable )
|
||||
|
Reference in New Issue
Block a user