#ifndef _WX_NETWORK_SOCKET_H
#define _WX_NETWORK_SOCKET_H
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "socket.h"
#endif
#include "wx/sckaddr.h"
#include "wx/gsocket.h"
+#include "wx/list.h"
// ------------------------------------------------------------------------
// Types and constants
void SetNotify(wxSocketEventFlags flags);
void Notify(bool notify);
+ // initialize/shutdown the sockets (usually called automatically)
+ static bool IsInitialized();
+ static bool Initialize();
+ static void Shutdown();
+
// callbacks are deprecated, use events instead
#if WXWIN_COMPATIBILITY
wxSockCbk Callback(wxSockCbk cbk_);
bool m_notify; // notify events to users?
wxSocketEventFlags m_eventmask; // which events to notify?
+ // the initialization count, GSocket is initialized if > 0
+ static size_t m_countInit;
+
// callbacks are deprecated, use events instead
#if WXWIN_COMPATIBILITY
wxSockCbk m_cbk; // callback
char *m_cdata; // callback data
#endif // WXWIN_COMPATIBILITY
+
+ DECLARE_NO_COPY_CLASS(wxSocketBase)
};
bool AcceptWith(wxSocketBase& socket, bool wait = TRUE);
bool WaitForAccept(long seconds = -1, long milliseconds = 0);
+
+ DECLARE_NO_COPY_CLASS(wxSocketServer)
};
virtual bool Connect(wxSockAddress& addr, bool wait = TRUE);
bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
+
+ DECLARE_NO_COPY_CLASS(wxSocketClient)
};
// WARNING: still in alpha stage
-class wxDatagramSocket : public wxSocketBase
+class WXDLLEXPORT wxDatagramSocket : public wxSocketBase
{
DECLARE_CLASS(wxDatagramSocket)
/* TODO:
bool Connect(wxSockAddress& addr);
*/
+ DECLARE_NO_COPY_CLASS(wxDatagramSocket)
};
class WXDLLEXPORT wxSocketEvent : public wxEvent
{
- DECLARE_DYNAMIC_CLASS(wxSocketEvent)
-
public:
- wxSocketEvent(int id = 0);
+ wxSocketEvent(int id = 0)
+ : wxEvent(id, wxEVT_SOCKET)
+ {
+ }
wxSocketNotify GetSocketEvent() const { return m_event; }
wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); }
wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); }
#endif // WXWIN_COMPATIBILITY_2
- void CopyObject(wxObject& object_dest) const;
+ virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
public:
wxSocketNotify m_event;
void *m_clientData;
+
+ DECLARE_DYNAMIC_CLASS(wxSocketEvent)
};
typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
-#define EVT_SOCKET(id, func) { wxEVT_SOCKET, id, -1, \
- (wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func, \
- (wxObject *) NULL },
+#define EVT_SOCKET(id, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_SOCKET, id, -1, \
+ (wxObjectEventFunction) \
+ (wxEventFunction) \
+ (wxSocketEventFunction) & func, \
+ (wxObject *) NULL ),
#endif