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

Correct the wxButton::Setlabel nonsense

Browse Source 
Added wxFrame::SetClientSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-08 13:44:36 +00:00
parent b6af8d80dc
commit b593568eca
8 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk1/button.cpp
View File

@@ -65,8 +65,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
PreCreation( parent, id, pos, newSize, style, name );
SetLabel(label);
m_widget = gtk_button_new_with_label( m_label );
SetLabel(label);
if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
if (newSize.y == -1) newSize.y = 26;
@@ -89,7 +89,7 @@ void wxButton::SetDefault(void)
void wxButton::SetLabel( const wxString &label )
{
wxControl::SetLabel( label );
GtkBin *bin = GTK_BIN( m_widget );
GtkButton *bin = GTK_BUTTON( m_widget );
GtkLabel *g_label = GTK_LABEL( bin->child );
gtk_label_set( g_label, GetLabel() );
};