Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only call GSocket_Init() when needed and do call it before using GAddress_XXX

Browse Source 
functions (fixes bug 510722)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-24 13:51:43 +00:00
parent e88be8c942
commit 6c0d0845c2
4 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/sckaddr.cpp
View File

@@ -22,19 +22,23 @@
#if wxUSE_SOCKETS
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/log.h"
#include "wx/intl.h"
#if !defined(__MWERKS__) && !defined(__SALFORDC__)
#include <memory.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#if !defined(__MWERKS__) && !defined(__SALFORDC__)
#include <memory.h>
#endif
#endif // !WX_PRECOMP
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/gsocket.h"
#include "wx/socket.h"
#include "wx/sckaddr.h"
IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
@@ -50,13 +54,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
// wxIPV4address
// ---------------------------------------------------------------------------
void wxSockAddress::Init()
{
if ( !wxSocketBase::IsInitialized() )
{
// we must do it before using GAddress_XXX functions
(void)wxSocketBase::Initialize();
}
}
wxSockAddress::wxSockAddress()
{
m_address = GAddress_new();
Init();
m_address = GAddress_new();
}
wxSockAddress::wxSockAddress(const wxSockAddress& other)
{
Init();
m_address = GAddress_copy(other.m_address);
}