From f04f570fd23deca0ee5ac90ebbda8fbe89f1b9e7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 27 Feb 2012 00:40:16 +0000 Subject: [PATCH] Only include 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 --- demos/forty/scorefil.cpp | 5 ----- src/gtk/dirdlg.cpp | 2 ++ src/gtk/filedlg.cpp | 2 ++ src/gtk/filepicker.cpp | 2 ++ src/gtk/utilsgtk.cpp | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp index 96f66d3..9d60a32 100644 --- a/demos/forty/scorefil.cpp +++ b/demos/forty/scorefil.cpp @@ -20,11 +20,6 @@ #include "wx/wx.h" #endif -#ifdef __WXGTK__ -#include -#include -#include -#endif #include "wx/textfile.h" #include "wx/config.h" #include "wx/fileconf.h" diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp index c6655fd..07cc55c 100644 --- a/src/gtk/dirdlg.cpp +++ b/src/gtk/dirdlg.cpp @@ -31,7 +31,9 @@ #include "wx/gtk/private.h" +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "clicked" for OK-button diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index a9359fa..6ba8320 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -22,7 +22,9 @@ #include #include "wx/gtk/private.h" +#ifdef __UNIX__ #include // chdir +#endif #include "wx/filename.h" // wxFilename #include "wx/tokenzr.h" // wxStringTokenizer diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index f457717..b3d1678 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -144,7 +144,9 @@ void wxFileButton::SetInitialDirectory(const wxString& dir) #if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__) +#ifdef __UNIX__ #include // chdir +#endif //----------------------------------------------------------------------------- // "current-folder-changed" diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index abe0d04..0d1add8 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -45,8 +45,9 @@ #include #include #include -#include // for WNOHANG +#ifdef __UNIX__ #include +#endif #if wxUSE_DETECT_SM #include -- 2.7.4