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

3
build/bakefiles/common.bkl
View File

@@ -115,6 +115,9 @@
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>

116
build/bakefiles/files.bkl
View File

@@ -39,7 +39,6 @@
<set var="BASE_UNIX_SRC" hints="files">
src/unix/baseunix.cpp
src/unix/dir.cpp
src/unix/gsocket.c
src/unix/mimetype.cpp
src/unix/snglinst.cpp
src/unix/threadpsx.cpp
@@ -48,13 +47,10 @@
src/unix/utilsunx.cpp
</set>
<set var="BASE_UNIX_HDR" hints="files">
wx/unix/gsockunx.h
wx/unix/mimetype.h
</set>
<set var="BASE_WIN32_SRC" hints="files">
src/msw/gsocket.c
src/msw/gsockmsw.c
src/msw/basemsw.cpp
src/msw/dde.cpp
src/msw/dir.cpp
@@ -85,7 +81,6 @@
<set var="BASE_DARWIN_SRC" hints="files">
src/unix/baseunix.cpp
src/unix/dir.cpp
src/unix/gsocket.c
src/unix/mimetype.cpp
src/unix/snglinst.cpp
src/unix/threadpsx.cpp
@@ -99,7 +94,6 @@
<set var="BASE_MAC_SRC" hints="files">
src/unix/baseunix.cpp
src/mac/dirmac.cpp
src/mac/gsocket.c
src/mac/mimetmac.cpp
src/mac/utils.cpp
src/mac/utilsexc.cpp
@@ -139,12 +133,9 @@
src/common/filename.cpp
src/common/filesys.cpp
src/common/fmapbase.cpp
src/common/fs_inet.cpp
src/common/fs_zip.cpp
src/common/ftp.cpp
src/common/hash.cpp
src/common/hashmap.cpp
src/common/http.cpp
src/common/init.cpp
src/common/intl.cpp
src/common/ipcbase.cpp
@@ -157,13 +148,7 @@
src/common/mstream.cpp
src/common/object.cpp
src/common/process.cpp
src/common/protocol.cpp
src/common/regex.cpp
src/common/sckaddr.cpp
src/common/sckfile.cpp
src/common/sckipc.cpp
src/common/sckstrm.cpp
src/common/socket.cpp
src/common/stopwatch.cpp
src/common/strconv.cpp
src/common/stream.cpp
@@ -174,7 +159,6 @@
src/common/tokenzr.cpp
src/common/txtstrm.cpp
src/common/unzip.c
src/common/url.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxchar.cpp
@@ -229,10 +213,8 @@
wx/filesys.h
wx/fontenc.h
wx/fontmap.h
wx/fs_inet.h
wx/fs_zip.h
wx/fs_mem.h
wx/gsocket.h
wx/hash.h
wx/hashmap.h
wx/iconloc.h
@@ -258,10 +240,6 @@
wx/platform.h
wx/process.h
wx/regex.h
wx/sckaddr.h
wx/sckipc.h
wx/sckstrm.h
wx/socket.h
wx/snglinst.h
wx/stopwatch.h
wx/strconv.h
@@ -274,7 +252,6 @@
wx/thrimpl.cpp
wx/tokenzr.h
wx/txtstrm.h
wx/url.h
wx/utils.h
wx/variant.h
wx/vector.h
@@ -286,8 +263,71 @@
wx/wxprec.h
wx/zipstrm.h
wx/zstream.h
</set>
<!-- ====================================================================== -->
<!-- wxNet (part of wxBase) -->
<!-- ====================================================================== -->
<set var="NET_UNIX_SRC" hints="files">
src/unix/gsocket.c
</set>
<set var="NET_UNIX_HDR" hints="files">
wx/unix/gsockunx.h
</set>
<set var="NET_WIN32_SRC" hints="files">
src/msw/gsocket.c
src/msw/gsockmsw.c
</set>
<set var="NET_WIN32_HDR" hints="files">
wx/msw/gsockmsw.h
</set>
<set var="NET_DARWIN_SRC" hints="files">
src/unix/gsocket.c
</set>
<set var="NET_DARWIN_HDR" hints="files">
wx/unix/gsockunx.h
</set>
<set var="NET_MAC_SRC" hints="files">
src/mac/gsocket.c
</set>
<set var="NET_MAC_HDR" hints="files">
wx/mac/gsockmac.h
</set>
<set var="NET_OS2_SRC" hints="files">
</set>
<set var="NET_OS2_HDR" hints="files">
</set>
<set var="NET_CMN_SRC" hints="files">
src/common/fs_inet.cpp
src/common/ftp.cpp
src/common/http.cpp
src/common/protocol.cpp
src/common/url.cpp
src/common/sckfile.cpp
src/common/sckaddr.cpp
src/common/sckipc.cpp
src/common/sckstrm.cpp
src/common/socket.cpp
</set>
<set var="NET_CMN_HDR" hints="files">
wx/fs_inet.h
wx/url.h
wx/protocol/protocol.h
wx/protocol/http.h
wx/protocol/ftp.h
wx/protocol/file.h
wx/gsocket.h
wx/sckaddr.h
wx/sckipc.h
wx/sckstrm.h
wx/socket.h
</set>
@@ -2008,6 +2048,8 @@
<!-- Define sources for specific libraries: -->
<!-- ====================================================================== -->
<!-- wxBase files: -->
<!-- Nested if would be nicer, but this works -->
<set var="BASE_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
@@ -2040,6 +2082,33 @@
</set>
<!-- wxNet files: -->
<set var="NET_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
</set>
<set var="NET_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
</set>
<set var="NET_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
$(NET_CMN_SRC) $(NET_PLATFORM_SRC)
</set>
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
@@ -2099,6 +2168,7 @@
<set var="ALL_HEADERS" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
$(ALL_GUI_HEADERS)
$(HTML_HDR) $(XML_HDR)
$(OPENGL_HDR)

2
build/bakefiles/monolithic.bkl
View File

@@ -6,7 +6,7 @@
<if cond="USE_GUI=='1'">$(CORE_SRC) $(HTML_SRC)</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"

23
build/bakefiles/multilib.bkl
View File

@@ -24,6 +24,29 @@
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
<!-- ================================================================= -->
<!-- wxNet library -->
<!-- ================================================================= -->
<dll id="netdll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_NET</define>
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="netlib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_NET</define>
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR)</msvc-headers>
</lib>
<!-- ================================================================= -->
<!-- Main GUI library -->
<!-- ================================================================= -->

4
build/bakefiles/wxwin.py
View File

@@ -30,9 +30,9 @@ def mk_wxid(id):
# All libs that are part of the main library (i.e. non-contrib):
MAIN_LIBS = ['mono', 'base', 'core', 'html', 'xml']
MAIN_LIBS = ['mono', 'base', 'core', 'html', 'xml', 'net']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml']
LIBS_NOGUI = ['xml', 'net']
LIBS_GUI = ['core', 'html', 'gl']
def mkLibName(wxid):

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);

1
samples/html/test/test.bkl
View File

@@ -9,6 +9,7 @@
<sources>test.cpp</sources>
<wx-lib>html</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>test.rc</win32-res>
</exe>

2
samples/sockets/sockets.bkl
View File

@@ -6,6 +6,7 @@
<exe id="client" template="wx_sample" template_append="wx_append">
<sources>client.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>client.rc</win32-res>
</exe>
@@ -13,6 +14,7 @@
<exe id="server" template="wx_sample" template_append="wx_append">
<sources>server.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>server.rc</win32-res>
</exe>

4
src/common/fs_zip.cpp
View File

@@ -38,8 +38,8 @@
#include "unzip.h"
#endif
WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap );
WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
//----------------------------------------------------------------------------
// wxZipFSHandler