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/choice.cpp
View File

@@ -334,7 +334,7 @@ int wxChoice::FindString( const wxString &string, bool bCase ) const
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
label = GTK_LABEL( BUTTON_CHILD(m_widget) );
label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
@@ -373,7 +373,7 @@ void wxChoice::SetString( int n, const wxString& str )
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
label = GTK_LABEL( BUTTON_CHILD(m_widget) );
label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
@@ -402,7 +402,7 @@ wxString wxChoice::GetString( int n ) const
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
label = GTK_LABEL( BUTTON_CHILD(m_widget) );
label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
@@ -475,7 +475,7 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
if (bin->child)
label = bin->child;
if (!label)
label = BUTTON_CHILD(m_widget);
label = GTK_BIN(m_widget)->child;
gtk_widget_modify_style( label, style );