projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode
[wxWidgets.git]
/
include
/
wx
/
sckaddr.h
diff --git
a/include/wx/sckaddr.h
b/include/wx/sckaddr.h
index 17a9477905bb2c2e4b496eeff69f79e03f97902c..8e7067b0863b73fb3cbcd5fa72a43f193532ab87 100644
(file)
--- a/
include/wx/sckaddr.h
+++ b/
include/wx/sckaddr.h
@@
-6,14
+6,14
@@
// Created: 26/04/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
// Created: 26/04/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_NETWORK_ADDRESS_H
#define _WX_NETWORK_ADDRESS_H
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_NETWORK_ADDRESS_H
#define _WX_NETWORK_ADDRESS_H
-#if
def __GNUG__
-#pragma interface
+#if
defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface
"sckaddr.h"
#endif
#include "wx/defs.h"
#endif
#include "wx/defs.h"
@@
-24,31
+24,39
@@
#include "wx/gsocket.h"
#include "wx/gsocket.h"
-class WXDLL
EXPOR
T wxSockAddress : public wxObject {
+class WXDLL
IMPEXP_NE
T wxSockAddress : public wxObject {
DECLARE_ABSTRACT_CLASS(wxSockAddress)
public:
typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
wxSockAddress();
DECLARE_ABSTRACT_CLASS(wxSockAddress)
public:
typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
wxSockAddress();
+ wxSockAddress(const wxSockAddress& other);
virtual ~wxSockAddress();
virtual ~wxSockAddress();
+ wxSockAddress& operator=(const wxSockAddress& other);
+
virtual void Clear();
virtual int Type() = 0;
GAddress *GetAddress() const { return m_address; }
void SetAddress(GAddress *address);
virtual void Clear();
virtual int Type() = 0;
GAddress *GetAddress() const { return m_address; }
void SetAddress(GAddress *address);
- const wxSockAddress& operator =(const wxSockAddress& addr);
- void CopyObject(wxObject& dest) const;
+ // we need to be able to create copies of the addresses polymorphically (i.e.
+ // without knowing the exact address class)
+ virtual wxSockAddress *Clone() const = 0;
protected:
GAddress *m_address;
protected:
GAddress *m_address;
+
+private:
+ void Init();
};
};
-class WXDLL
EXPOR
T wxIPV4address : public wxSockAddress {
+class WXDLL
IMPEXP_NE
T wxIPV4address : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxIPV4address)
public:
wxIPV4address();
DECLARE_DYNAMIC_CLASS(wxIPV4address)
public:
wxIPV4address();
+ wxIPV4address(const wxIPV4address& other);
virtual ~wxIPV4address();
bool Hostname(const wxString& name);
virtual ~wxIPV4address();
bool Hostname(const wxString& name);
@@
-59,19
+67,26
@@
public:
bool AnyAddress();
wxString Hostname();
bool AnyAddress();
wxString Hostname();
+ wxString OrigHostname() { return m_origHostname; }
unsigned short Service();
unsigned short Service();
+ wxString IPAddress() const;
- inline int Type() { return wxSockAddress::IPV4; }
+ virtual int Type() { return wxSockAddress::IPV4; }
+ virtual wxSockAddress *Clone() const;
+
+private:
+ wxString m_origHostname;
};
#ifdef ENABLE_IPV6
};
#ifdef ENABLE_IPV6
-class WXDLL
EXPOR
T wxIPV6address : public wxSockAddress {
+class WXDLL
IMPEXP_NE
T wxIPV6address : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxIPV6address)
private:
struct sockaddr_in6 *m_addr;
public:
wxIPV6address();
DECLARE_DYNAMIC_CLASS(wxIPV6address)
private:
struct sockaddr_in6 *m_addr;
public:
wxIPV6address();
- ~wxIPV6address();
+ wxIPV6address(const wxIPV6address& other);
+ virtual ~wxIPV6address();
bool Hostname(const wxString& name);
bool Hostname(unsigned char addr[16]);
bool Hostname(const wxString& name);
bool Hostname(unsigned char addr[16]);
@@
-82,28
+97,31
@@
public:
wxString Hostname() const;
unsigned short Service() const;
wxString Hostname() const;
unsigned short Service() const;
- inline int Type() { return wxSockAddress::IPV6; }
+ virtual int Type() { return wxSockAddress::IPV6; }
+ virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); }
};
#endif
};
#endif
-#if defined(__UNIX__) && !defined(__
APPLE__
)
+#if defined(__UNIX__) && !defined(__
WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)
)
#include <sys/socket.h>
#ifndef __VMS__
# include <sys/un.h>
#endif
#include <sys/socket.h>
#ifndef __VMS__
# include <sys/un.h>
#endif
-class WXDLL
EXPOR
T wxUNIXaddress : public wxSockAddress {
+class WXDLL
IMPEXP_NE
T wxUNIXaddress : public wxSockAddress {
DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
private:
struct sockaddr_un *m_addr;
public:
wxUNIXaddress();
DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
private:
struct sockaddr_un *m_addr;
public:
wxUNIXaddress();
- ~wxUNIXaddress();
+ wxUNIXaddress(const wxUNIXaddress& other);
+ virtual ~wxUNIXaddress();
void Filename(const wxString& name);
wxString Filename();
void Filename(const wxString& name);
wxString Filename();
- inline int Type() { return wxSockAddress::UNIX; }
+ virtual int Type() { return wxSockAddress::UNIX; }
+ virtual wxSockAddress *Clone() const { return new wxUNIXaddress(*this); }
};
#endif
// __UNIX__
};
#endif
// __UNIX__