projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show the function in which the assert failure occured if the compiler supports it
[wxWidgets.git]
/
include
/
wx
/
sckipc.h
diff --git
a/include/wx/sckipc.h
b/include/wx/sckipc.h
index 9e5b847389d36ecfa5a7d983a2319a551ab55c47..70ea564b785600af57c78dd77de6d74d65a03fb6 100644
(file)
--- a/
include/wx/sckipc.h
+++ b/
include/wx/sckipc.h
@@
-16,10
+16,6
@@
#ifndef _WX_SCKIPC_H
#define _WX_SCKIPC_H
#ifndef _WX_SCKIPC_H
#define _WX_SCKIPC_H
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "sckipc.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_SOCKETS && wxUSE_IPC
#include "wx/defs.h"
#if wxUSE_SOCKETS && wxUSE_IPC
@@
-53,10
+49,10
@@
*
*/
*
*/
-class WXDLL
EXPORT_BASE
wxTCPServer;
-class WXDLL
EXPORT_BASE
wxTCPClient;
+class WXDLL
IMPEXP_NET
wxTCPServer;
+class WXDLL
IMPEXP_NET
wxTCPClient;
-class WXDLL
EXPORT_BASE
wxTCPConnection: public wxConnectionBase
+class WXDLL
IMPEXP_NET
wxTCPConnection: public wxConnectionBase
{
DECLARE_DYNAMIC_CLASS(wxTCPConnection)
{
DECLARE_DYNAMIC_CLASS(wxTCPConnection)
@@
-79,12
+75,16
@@
public:
virtual bool Disconnect(void);
// Callbacks to BOTH - override at will
virtual bool Disconnect(void);
// Callbacks to BOTH - override at will
- // Default behaviour is to delete connection and return
TRUE
- virtual bool OnDisconnect(void) { delete this; return
TRUE
; }
+ // Default behaviour is to delete connection and return
true
+ virtual bool OnDisconnect(void) { delete this; return
true
; }
// To enable the compressor (NOTE: not implemented!)
void Compress(bool on);
// To enable the compressor (NOTE: not implemented!)
void Compress(bool on);
+ // unhide the Execute overload from wxConnectionBase
+ virtual bool Execute(const wxString& str)
+ { return Execute(str, -1, wxIPC_TEXT); }
+
protected:
wxSocketBase *m_sock;
wxSocketStream *m_sockstrm;
protected:
wxSocketBase *m_sock;
wxSocketStream *m_sockstrm;
@@
-96,27
+96,18
@@
protected:
friend class wxTCPClient;
friend class wxTCPEventHandler;
friend class wxTCPClient;
friend class wxTCPEventHandler;
-private:
- //
- // We're hiding an Execute method in ConnectionBase
- //
- virtual bool Execute(const wxString& str)
- { return Execute(str, -1, wxIPC_TEXT); }
-
- DECLARE_NO_COPY_CLASS(wxTCPConnection)
+ DECLARE_NO_COPY_CLASS(wxTCPConnection)
};
};
-class wxTCPServer: public wxServerBase
+class
WXDLLIMPEXP_NET
wxTCPServer: public wxServerBase
{
{
- DECLARE_DYNAMIC_CLASS(wxTCPServer)
-
public:
wxTCPConnection *topLevelConnection;
wxTCPServer();
virtual ~wxTCPServer();
public:
wxTCPConnection *topLevelConnection;
wxTCPServer();
virtual ~wxTCPServer();
- // Returns
FALSE
on error (e.g. port number is already in use)
+ // Returns
false
on error (e.g. port number is already in use)
virtual bool Create(const wxString& serverName);
// Callbacks to SERVER - override at will
virtual bool Create(const wxString& serverName);
// Callbacks to SERVER - override at will
@@
-130,13
+121,12
@@
protected:
wxString m_filename;
#endif // __UNIX_LIKE__
wxString m_filename;
#endif // __UNIX_LIKE__
- DECLARE_NO_COPY_CLASS(wxTCPServer)
+ DECLARE_NO_COPY_CLASS(wxTCPServer)
+ DECLARE_DYNAMIC_CLASS(wxTCPServer)
};
};
-class wxTCPClient: public wxClientBase
+class
WXDLLIMPEXP_NET
wxTCPClient: public wxClientBase
{
{
- DECLARE_DYNAMIC_CLASS(wxTCPClient)
-
public:
wxTCPClient();
virtual ~wxTCPClient();
public:
wxTCPClient();
virtual ~wxTCPClient();
@@
-150,6
+140,9
@@
public:
// Callbacks to CLIENT - override at will
virtual wxConnectionBase *OnMakeConnection();
// Callbacks to CLIENT - override at will
virtual wxConnectionBase *OnMakeConnection();
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxTCPClient)
};
#endif // wxUSE_SOCKETS && wxUSE_IPC
};
#endif // wxUSE_SOCKETS && wxUSE_IPC