wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: unix/utilsunx.cpp
|
||||
// Name: src/unix/utilsunx.cpp
|
||||
// Purpose: generic Unix implementation of many wx functions
|
||||
// Author: Vadim Zeitlin
|
||||
// Id: $Id$
|
||||
@@ -18,8 +18,9 @@
|
||||
// for compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/string.h"
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/string.h"
|
||||
#endif
|
||||
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
@@ -280,7 +281,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
|
||||
// split the command line in arguments
|
||||
do
|
||||
{
|
||||
argument=wxT("");
|
||||
argument = wxEmptyString;
|
||||
quotechar = wxT('\0');
|
||||
|
||||
// eat leading whitespace:
|
||||
@@ -884,7 +885,7 @@ wxString wxGetOsDescription()
|
||||
return wxString::FromAscii( buf );
|
||||
}
|
||||
wxFAIL_MSG( _T("uname failed") );
|
||||
return _T("");
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
#endif // !__WXMAC__
|
||||
|
Reference in New Issue
Block a user