Only include <unistd.h> under Unix in wxGTK code.
Also remove the inclusions of some Unix-specific headers that were not needed at all. Closes #14048. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,11 +20,6 @@
|
|||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#endif
|
|
||||||
#include "wx/textfile.h"
|
#include "wx/textfile.h"
|
||||||
#include "wx/config.h"
|
#include "wx/config.h"
|
||||||
#include "wx/fileconf.h"
|
#include "wx/fileconf.h"
|
||||||
|
@@ -31,7 +31,9 @@
|
|||||||
|
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
|
|
||||||
|
#ifdef __UNIX__
|
||||||
#include <unistd.h> // chdir
|
#include <unistd.h> // chdir
|
||||||
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// "clicked" for OK-button
|
// "clicked" for OK-button
|
||||||
|
@@ -22,7 +22,9 @@
|
|||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
|
|
||||||
|
#ifdef __UNIX__
|
||||||
#include <unistd.h> // chdir
|
#include <unistd.h> // chdir
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/filename.h" // wxFilename
|
#include "wx/filename.h" // wxFilename
|
||||||
#include "wx/tokenzr.h" // wxStringTokenizer
|
#include "wx/tokenzr.h" // wxStringTokenizer
|
||||||
|
@@ -144,7 +144,9 @@ void wxFileButton::SetInitialDirectory(const wxString& dir)
|
|||||||
|
|
||||||
#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
|
#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
|
||||||
|
|
||||||
|
#ifdef __UNIX__
|
||||||
#include <unistd.h> // chdir
|
#include <unistd.h> // chdir
|
||||||
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// "current-folder-changed"
|
// "current-folder-changed"
|
||||||
|
@@ -45,8 +45,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/wait.h> // for WNOHANG
|
#ifdef __UNIX__
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if wxUSE_DETECT_SM
|
#if wxUSE_DETECT_SM
|
||||||
#include <X11/SM/SMlib.h>
|
#include <X11/SM/SMlib.h>
|
||||||
|
Reference in New Issue
Block a user