fixed compilation under GCC 2.95 - 'export' was used as variable name and GCC complained about export being a keyword
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5558ce7ce4
commit
5b8ab3827f
@ -308,32 +308,32 @@ void MyFrame::OnCommand( wxCommandEvent &event )
|
|||||||
#endif
|
#endif
|
||||||
case ID_HTML:
|
case ID_HTML:
|
||||||
{
|
{
|
||||||
wxLayoutExportObject *export;
|
wxLayoutExportObject *export0;
|
||||||
wxLayoutExportStatus status(m_lwin->GetLayoutList());
|
wxLayoutExportStatus status(m_lwin->GetLayoutList());
|
||||||
|
|
||||||
while((export = wxLayoutExport( &status,
|
while((export0 = wxLayoutExport( &status,
|
||||||
WXLO_EXPORT_AS_HTML)) != NULL)
|
WXLO_EXPORT_AS_HTML)) != NULL)
|
||||||
{
|
{
|
||||||
if(export->type == WXLO_EXPORT_HTML)
|
if(export0->type == WXLO_EXPORT_HTML)
|
||||||
cout << *(export->content.text);
|
cout << *(export0->content.text);
|
||||||
else
|
else
|
||||||
cout << "<!--UNKNOWN OBJECT>";
|
cout << "<!--UNKNOWN OBJECT>";
|
||||||
delete export;
|
delete export0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ID_TEXT:
|
case ID_TEXT:
|
||||||
{
|
{
|
||||||
wxLayoutExportObject *export;
|
wxLayoutExportObject *export0;
|
||||||
wxLayoutExportStatus status(m_lwin->GetLayoutList());
|
wxLayoutExportStatus status(m_lwin->GetLayoutList());
|
||||||
|
|
||||||
while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
|
while((export0 = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
|
||||||
{
|
{
|
||||||
if(export->type == WXLO_EXPORT_TEXT)
|
if(export0->type == WXLO_EXPORT_TEXT)
|
||||||
cout << *(export->content.text);
|
cout << *(export0->content.text);
|
||||||
else
|
else
|
||||||
cout << "<!--UNKNOWN OBJECT>";
|
cout << "<!--UNKNOWN OBJECT>";
|
||||||
delete export;
|
delete export0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user