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

Remove obsolete GTK1 compatibility macros. Patch #1413458 - Paul Cornett

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-03 20:38:55 +00:00
parent 1794103bab
commit afa7bd1eef
14 changed files with 47 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/button.cpp
View File

@@ -145,8 +145,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
else
#endif
{
if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
if (GTK_IS_MISC(GTK_BIN(m_widget)->child))
gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child),
x_alignment, y_alignment);
}
@@ -255,7 +255,7 @@ bool wxButton::Enable( bool enable )
if ( !wxControl::Enable( enable ) )
return FALSE;
gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
return TRUE;
}
@@ -268,7 +268,7 @@ bool wxButton::IsOwnGtkWindow( GdkWindow *window )
void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style(m_widget, style);
gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
}
wxSize wxButton::DoGetBestSize() const