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
This commit is contained in:
		@@ -1,18 +1,16 @@
 | 
				
			|||||||
/* -------------------------------------------------------------------------
 | 
					/////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 * Project:     GSocket (Generic Socket)
 | 
					// Name:        wx/private/gsocket.h
 | 
				
			||||||
 * Name:        gsocket.h
 | 
					// Purpose:     GSocket implementation
 | 
				
			||||||
 * Author:      Guilhem Lavaux
 | 
					// Authors:     Guilhem Lavaux, Vadim Zeitlin
 | 
				
			||||||
 *              Guillermo Rodriguez Garcia <guille@iies.es>
 | 
					// Created:     April 1997
 | 
				
			||||||
 * Copyright:   (c) Guilhem Lavaux
 | 
					// RCS-ID:      $Id$
 | 
				
			||||||
 *              (c) 2007,2008 Vadim Zeitlin <vadim@wxwidgets.org>
 | 
					// Copyright:   (c) 1997 Guilhem Lavaux
 | 
				
			||||||
 * Licence:     wxWindows Licence
 | 
					//              (c) 2008 Vadim Zeitlin
 | 
				
			||||||
 * Purpose:     GSocket include file (system independent)
 | 
					// Licence:     wxWindows licence
 | 
				
			||||||
 * CVSID:       $Id$
 | 
					/////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 * -------------------------------------------------------------------------
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef _WX_GSOCKET_H_
 | 
					#ifndef _WX_PRIVATE_GSOCKET_H_
 | 
				
			||||||
#define _WX_GSOCKET_H_
 | 
					#define _WX_PRIVATE_GSOCKET_H_
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/defs.h"
 | 
					#include "wx/defs.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -350,4 +348,4 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#endif /* wxUSE_SOCKETS */
 | 
					#endif /* wxUSE_SOCKETS */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* _WX_GSOCKET_H_ */
 | 
					#endif /* _WX_PRIVATE_GSOCKET_H_ */
 | 
				
			||||||
@@ -16,7 +16,7 @@
 | 
				
			|||||||
#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
 | 
					#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/private/selectdispatcher.h"
 | 
					#include "wx/private/selectdispatcher.h"
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class WXDLLIMPEXP_BASE wxGSocketIOHandler : public wxFDIOHandler
 | 
					class WXDLLIMPEXP_BASE wxGSocketIOHandler : public wxFDIOHandler
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "wx/event.h"
 | 
					#include "wx/event.h"
 | 
				
			||||||
#include "wx/sckaddr.h"
 | 
					#include "wx/sckaddr.h"
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/list.h"
 | 
					#include "wx/list.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ------------------------------------------------------------------------
 | 
					// ------------------------------------------------------------------------
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@
 | 
				
			|||||||
    #endif
 | 
					    #endif
 | 
				
			||||||
#endif // !WX_PRECOMP
 | 
					#endif // !WX_PRECOMP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/socket.h"
 | 
					#include "wx/socket.h"
 | 
				
			||||||
#include "wx/sckaddr.h"
 | 
					#include "wx/sckaddr.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <gdk/gdk.h>
 | 
					#include <gdk/gdk.h>
 | 
				
			||||||
#include <glib.h>
 | 
					#include <glib.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern "C" {
 | 
					extern "C" {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
#include <gdk/gdk.h>
 | 
					#include <gdk/gdk.h>
 | 
				
			||||||
#include <glib.h>
 | 
					#include <glib.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern "C" {
 | 
					extern "C" {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
 | 
					#include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
 | 
				
			||||||
#include "wx/motif/private.h"   // wxGetAppContext()
 | 
					#include "wx/motif/private.h"   // wxGetAppContext()
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern "C" {
 | 
					extern "C" {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -57,7 +57,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if wxUSE_SOCKETS
 | 
					#if wxUSE_SOCKETS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/link.h"
 | 
					#include "wx/link.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wxFORCE_LINK_MODULE(gsockmsw)
 | 
					wxFORCE_LINK_MODULE(gsockmsw)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@
 | 
				
			|||||||
#   pragma warning(disable:4115) /* named type definition in parentheses */
 | 
					#   pragma warning(disable:4115) /* named type definition in parentheses */
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
#include "wx/link.h"
 | 
					#include "wx/link.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
#if wxUSE_SOCKETS
 | 
					#if wxUSE_SOCKETS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/app.h"
 | 
					#include "wx/app.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if wxUSE_SOCKETS
 | 
					#if wxUSE_SOCKETS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
#include "wx/apptrait.h"
 | 
					#include "wx/apptrait.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <CoreFoundation/CoreFoundation.h>
 | 
					#include <CoreFoundation/CoreFoundation.h>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#if wxUSE_SOCKETS
 | 
					#if wxUSE_SOCKETS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/gsocket.h"
 | 
					#include "wx/private/gsocket.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "wx/private/fd.h"
 | 
					#include "wx/private/fd.h"
 | 
				
			||||||
#include "wx/private/socket.h"
 | 
					#include "wx/private/socket.h"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user