projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.
[wxWidgets.git]
/
src
/
common
/
sckaddr.cpp
diff --git
a/src/common/sckaddr.cpp
b/src/common/sckaddr.cpp
index b706132e5c7201b5a9808422b5539e5bb60f9114..67ca3fbcdfa77af4a5a368ad4eb55a98f3d90bac 100644
(file)
--- a/
src/common/sckaddr.cpp
+++ b/
src/common/sckaddr.cpp
@@
-31,6
+31,7
@@
#include "wx/object.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/object.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/thread.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-48,7
+49,7
@@
#include <errno.h>
#include <errno.h>
-#if
def __UNIX__
+#if
defined(__UNIX__) && !defined(__CYGWIN__)
#include <netdb.h>
#include <arpa/inet.h>
#endif // __UNIX__
#include <netdb.h>
#include <arpa/inet.h>
#endif // __UNIX__
@@
-81,8
+82,12
@@
IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
#ifdef __WXMSW__
#define HAVE_INET_ADDR
#ifdef __WXMSW__
#define HAVE_INET_ADDR
+ #ifndef HAVE_GETHOSTBYNAME
#define HAVE_GETHOSTBYNAME
#define HAVE_GETHOSTBYNAME
+ #endif
+ #ifndef HAVE_GETSERVBYNAME
#define HAVE_GETSERVBYNAME
#define HAVE_GETSERVBYNAME
+ #endif
// under MSW getxxxbyname() functions are MT-safe (but not reentrant) so
// we don't need to serialize calls to them
// under MSW getxxxbyname() functions are MT-safe (but not reentrant) so
// we don't need to serialize calls to them
@@
-508,7
+513,7
@@
bool wxSockAddressImpl::SetHostName4(const wxString& name)
if ( !addr )
return false;
if ( !addr )
return false;
- const wx
UTF8Buf
namebuf(name.utf8_str());
+ const wx
ScopedCharBuffer
namebuf(name.utf8_str());
// first check if this is an address in quad dotted notation
#if defined(HAVE_INET_ATON)
// first check if this is an address in quad dotted notation
#if defined(HAVE_INET_ATON)
@@
-695,7
+700,7
@@
bool wxSockAddressImpl::SetPath(const wxString& path)
if ( !addr )
return false;
if ( !addr )
return false;
- const wx
UTF8Buf
buf(path.utf8_str());
+ const wx
ScopedCharBuffer
buf(path.utf8_str());
if ( strlen(buf) >= UNIX_PATH_MAX )
return false;
if ( strlen(buf) >= UNIX_PATH_MAX )
return false;
@@
-734,7
+739,7
@@
int wxSockAddress::GetAddressDataLen() const
void wxSockAddress::Init()
{
void wxSockAddress::Init()
{
- if ( !wxSocketBase::IsInitialized() )
+ if (
wxIsMainThread() &&
!wxSocketBase::IsInitialized() )
{
// we must do it before using any socket functions
(void)wxSocketBase::Initialize();
{
// we must do it before using any socket functions
(void)wxSocketBase::Initialize();
@@
-873,7
+878,7
@@
wxString wxIPV4address::IPAddress() const
return wxString::Format
(
return wxString::Format
(
- "%
lu.%lu.%lu.%l
u",
+ "%
u.%u.%u.%
u",
(addr >> 24) & 0xff,
(addr >> 16) & 0xff,
(addr >> 8) & 0xff,
(addr >> 24) & 0xff,
(addr >> 16) & 0xff,
(addr >> 8) & 0xff,