Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split wxBase into wxBase and wxNet libraries

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-27 22:41:06 +00:00
parent c0421c9993
commit 7c4728f633
21 changed files with 168 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/defs.h
View File

@@ -395,6 +395,7 @@ typedef int wxWindowID;
#define WXMAKINGDLL_BASE
#endif
#define WXMAKINGDLL_NET
#define WXMAKINGDLL_CORE
#define WXMAKINGDLL_HTML
#define WXMAKINGDLL_XML
@@ -413,6 +414,17 @@ typedef int wxWindowID;
#define WXDLLIMPEXP_DATA_BASE(type) type
#endif
#ifdef WXMAKINGDLL_NET
#define WXDLLIMPEXP_NET WXEXPORT
#define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_NET WXIMPORT
#define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_NET
#define WXDLLIMPEXP_DATA_NET(type) type
#endif
#ifdef WXMAKINGDLL_CORE
#define WXDLLIMPEXP_CORE WXEXPORT
#define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type

1
include/wx/filesys.h
View File

@@ -27,7 +27,6 @@
#if wxUSE_FILESYSTEM
#include "wx/stream.h"
#include "wx/url.h"
#include "wx/datetime.h"
#include "wx/filename.h"

2
include/wx/fs_inet.h
View File

@@ -39,7 +39,7 @@ limitation)
// wxInternetFSHandler
//--------------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxInternetFSHandler : public wxFileSystemHandler
class WXDLLIMPEXP_NET wxInternetFSHandler : public wxFileSystemHandler
{
private:
wxHashTable m_Cache;

6
include/wx/gsocket.h
View File

@@ -17,8 +17,8 @@
/* kludge for GTK.. gsockgtk.c craps out miserably if we include
defs.h ... no idea how other files get away with it.. */
#if !defined( __WXMSW__ ) && !defined( WXDLLEXPORT )
#define WXDLLEXPORT
#if !defined( __WXMSW__ ) && !defined( WXDLLIMPEXP_NET )
#define WXDLLIMPEXP_NET
#endif
#endif
@@ -251,7 +251,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
* operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error.
*/
GSocketError WXDLLEXPORT GSocket_GetError(GSocket *socket);
GSocketError WXDLLIMPEXP_NET GSocket_GetError(GSocket *socket);
/* Callbacks */

2
include/wx/protocol/file.h
View File

@@ -23,7 +23,7 @@
#include "wx/protocol/protocol.h"
#include "wx/url.h"
class WXDLLIMPEXP_BASE wxFileProto: public wxProtocol {
class WXDLLIMPEXP_NET wxFileProto: public wxProtocol {
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
DECLARE_PROTOCOL(wxFileProto)
protected:

2
include/wx/protocol/ftp.h
View File

@@ -25,7 +25,7 @@
#include "wx/protocol/protocol.h"
#include "wx/url.h"
class WXDLLIMPEXP_BASE wxFTP : public wxProtocol
class WXDLLIMPEXP_NET wxFTP : public wxProtocol
{
public:
enum TransferMode

5
include/wx/protocol/http.h
View File

@@ -18,9 +18,10 @@
#include "wx/hashmap.h"
#include "wx/protocol/protocol.h"
WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxString, wxStringToStringHashMap );
WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
class WXDLLIMPEXP_NET );
class WXDLLIMPEXP_BASE wxHTTP : public wxProtocol
class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
{
public:
wxHTTP();

6
include/wx/protocol/protocol.h
View File

@@ -50,7 +50,7 @@ typedef enum
// wxProtocol: abstract base class for all protocols
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxProtocol
class WXDLLIMPEXP_NET wxProtocol
#if wxUSE_SOCKETS
: public wxSocketClient
#else
@@ -86,7 +86,7 @@ private:
};
#if wxUSE_SOCKETS
wxProtocolError WXDLLIMPEXP_BASE GetLine(wxSocketBase *sock, wxString& result);
wxProtocolError WXDLLIMPEXP_NET GetLine(wxSocketBase *sock, wxString& result);
#endif
// ----------------------------------------------------------------------------
@@ -108,7 +108,7 @@ bool wxProtocolUse##class = TRUE;
wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
} wxProtocolDoUse##class;
class WXDLLIMPEXP_BASE wxProtoInfo : public wxObject
class WXDLLIMPEXP_NET wxProtoInfo : public wxObject
{
public:
wxProtoInfo(const wxChar *name,

8
include/wx/sckaddr.h
View File

@@ -24,7 +24,7 @@
#include "wx/gsocket.h"
class WXDLLIMPEXP_BASE wxSockAddress : public wxObject {
class WXDLLIMPEXP_NET wxSockAddress : public wxObject {
DECLARE_ABSTRACT_CLASS(wxSockAddress)
public:
typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
@@ -52,7 +52,7 @@ private:
void Init();
};
class WXDLLIMPEXP_BASE wxIPV4address : public wxSockAddress {
class WXDLLIMPEXP_NET wxIPV4address : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxIPV4address)
public:
wxIPV4address();
@@ -79,7 +79,7 @@ private:
};
#ifdef ENABLE_IPV6
class WXDLLIMPEXP_BASE wxIPV6address : public wxSockAddress {
class WXDLLIMPEXP_NET wxIPV6address : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxIPV6address)
private:
struct sockaddr_in6 *m_addr;
@@ -108,7 +108,7 @@ public:
# include <sys/un.h>
#endif
class WXDLLIMPEXP_BASE wxUNIXaddress : public wxSockAddress {
class WXDLLIMPEXP_NET wxUNIXaddress : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
private:
struct sockaddr_un *m_addr;

6
include/wx/sckipc.h
View File

@@ -53,10 +53,10 @@
*
*/
class WXDLLIMPEXP_BASE wxTCPServer;
class WXDLLIMPEXP_BASE wxTCPClient;
class WXDLLIMPEXP_NET wxTCPServer;
class WXDLLIMPEXP_NET wxTCPClient;
class WXDLLIMPEXP_BASE wxTCPConnection: public wxConnectionBase
class WXDLLIMPEXP_NET wxTCPConnection: public wxConnectionBase
{
DECLARE_DYNAMIC_CLASS(wxTCPConnection)

6
include/wx/sckstrm.h
View File

@@ -21,7 +21,7 @@
#include "wx/socket.h"
class WXDLLIMPEXP_BASE wxSocketOutputStream : public wxOutputStream
class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
{
public:
wxSocketOutputStream(wxSocketBase& s);
@@ -40,7 +40,7 @@ class WXDLLIMPEXP_BASE wxSocketOutputStream : public wxOutputStream
DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
};
class WXDLLIMPEXP_BASE wxSocketInputStream : public wxInputStream
class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
{
public:
wxSocketInputStream(wxSocketBase& s);
@@ -59,7 +59,7 @@ class WXDLLIMPEXP_BASE wxSocketInputStream : public wxInputStream
DECLARE_NO_COPY_CLASS(wxSocketInputStream)
};
class WXDLLIMPEXP_BASE wxSocketStream : public wxSocketInputStream,
class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream
{
public:

10
include/wx/socket.h
View File

@@ -105,7 +105,7 @@ typedef int wxSocketFlags;
// wxSocketBase
// --------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxSocketBase : public wxObject
class WXDLLIMPEXP_NET wxSocketBase : public wxObject
{
DECLARE_CLASS(wxSocketBase)
@@ -270,7 +270,7 @@ private:
// wxSocketServer
// --------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxSocketServer : public wxSocketBase
class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase
{
DECLARE_CLASS(wxSocketServer)
@@ -290,7 +290,7 @@ public:
// wxSocketClient
// --------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxSocketClient : public wxSocketBase
class WXDLLIMPEXP_NET wxSocketClient : public wxSocketBase
{
DECLARE_CLASS(wxSocketClient)
@@ -312,7 +312,7 @@ public:
// WARNING: still in alpha stage
class WXDLLIMPEXP_BASE wxDatagramSocket : public wxSocketBase
class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase
{
DECLARE_CLASS(wxDatagramSocket)
@@ -337,7 +337,7 @@ public:
// wxSocketEvent
// --------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxSocketEvent : public wxEvent
class WXDLLIMPEXP_NET wxSocketEvent : public wxEvent
{
public:
wxSocketEvent(int id = 0)

2
include/wx/url.h
View File

@@ -37,7 +37,7 @@ typedef enum {
wxURL_PROTOERR
} wxURLError;
class WXDLLIMPEXP_BASE wxURL : public wxObject
class WXDLLIMPEXP_NET wxURL : public wxObject
{
public:
wxURL(const wxString& url);