From 04889c59c6d3c009d8150d5cfa6aa3f0dfa82daf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 26 Nov 2008 12:21:56 +0000 Subject: [PATCH] move wx/gsocket.h to wx/private/gsocket.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/{ => private}/gsocket.h | 30 +++++++++++++-------------- include/wx/private/gsocketiohandler.h | 2 +- include/wx/socket.h | 2 +- src/common/sckaddr.cpp | 2 +- src/gtk/gsockgtk.cpp | 2 +- src/gtk1/gsockgtk.cpp | 2 +- src/motif/gsockmot.cpp | 2 +- src/msw/gsocket.cpp | 2 +- src/msw/gsockmsw.cpp | 2 +- src/os2/gsockpm.cpp | 2 +- src/osx/core/gsockosx.cpp | 2 +- src/unix/gsocket.cpp | 2 +- 12 files changed, 25 insertions(+), 27 deletions(-) rename include/wx/{ => private}/gsocket.h (94%) diff --git a/include/wx/gsocket.h b/include/wx/private/gsocket.h similarity index 94% rename from include/wx/gsocket.h rename to include/wx/private/gsocket.h index a1d76b9144..f8379003ed 100644 --- a/include/wx/gsocket.h +++ b/include/wx/private/gsocket.h @@ -1,18 +1,16 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) - * Name: gsocket.h - * Author: Guilhem Lavaux - * Guillermo Rodriguez Garcia - * Copyright: (c) Guilhem Lavaux - * (c) 2007,2008 Vadim Zeitlin - * Licence: wxWindows Licence - * Purpose: GSocket include file (system independent) - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -#ifndef _WX_GSOCKET_H_ -#define _WX_GSOCKET_H_ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/private/gsocket.h +// Purpose: GSocket implementation +// Authors: Guilhem Lavaux, Vadim Zeitlin +// Created: April 1997 +// RCS-ID: $Id$ +// Copyright: (c) 1997 Guilhem Lavaux +// (c) 2008 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_GSOCKET_H_ +#define _WX_PRIVATE_GSOCKET_H_ #include "wx/defs.h" @@ -350,4 +348,4 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); #endif /* wxUSE_SOCKETS */ -#endif /* _WX_GSOCKET_H_ */ +#endif /* _WX_PRIVATE_GSOCKET_H_ */ diff --git a/include/wx/private/gsocketiohandler.h b/include/wx/private/gsocketiohandler.h index 00c4cf3ea9..65f529d327 100644 --- a/include/wx/private/gsocketiohandler.h +++ b/include/wx/private/gsocketiohandler.h @@ -16,7 +16,7 @@ #if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER #include "wx/private/selectdispatcher.h" -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" class WXDLLIMPEXP_BASE wxGSocketIOHandler : public wxFDIOHandler { diff --git a/include/wx/socket.h b/include/wx/socket.h index 6107362658..8c40673a98 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -22,7 +22,7 @@ #include "wx/event.h" #include "wx/sckaddr.h" -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/list.h" // ------------------------------------------------------------------------ diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index dd801147b3..9c37cc6489 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -32,7 +32,7 @@ #endif #endif // !WX_PRECOMP -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/socket.h" #include "wx/sckaddr.h" diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp index 9a284628e1..0c034edfef 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/gsockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp index 9a284628e1..0c034edfef 100644 --- a/src/gtk1/gsockgtk.cpp +++ b/src/gtk1/gsockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp index 238c0cbca8..144eb61cd8 100644 --- a/src/motif/gsockmot.cpp +++ b/src/motif/gsockmot.cpp @@ -15,7 +15,7 @@ #include // XtAppAdd/RemoveInput() #include "wx/motif/private.h" // wxGetAppContext() -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index cb88ba7af2..96af816836 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -57,7 +57,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/link.h" wxFORCE_LINK_MODULE(gsockmsw) diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp index f2cf192df8..dd9e757027 100644 --- a/src/msw/gsockmsw.cpp +++ b/src/msw/gsockmsw.cpp @@ -36,7 +36,7 @@ # pragma warning(disable:4115) /* named type definition in parentheses */ #endif -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" #include "wx/link.h" diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp index a02d29ef6f..841675297d 100644 --- a/src/os2/gsockpm.cpp +++ b/src/os2/gsockpm.cpp @@ -12,7 +12,7 @@ #if wxUSE_SOCKETS #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/app.h" #include "wx/apptrait.h" diff --git a/src/osx/core/gsockosx.cpp b/src/osx/core/gsockosx.cpp index b3b7114e9f..38bc5b1da8 100644 --- a/src/osx/core/gsockosx.cpp +++ b/src/osx/core/gsockosx.cpp @@ -10,7 +10,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" #include diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index 6efa6b76ad..fdda9ab843 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -16,7 +16,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/private/fd.h" #include "wx/private/socket.h" -- 2.50.0