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

Code cleaning: whitespaces, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!NotEmpty().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-24 10:31:41 +00:00
parent d64b1c760b
commit d71cc120e3
18 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/msw/dialup.cpp
View File

@@ -179,7 +179,7 @@ public:
virtual bool HangUp();
virtual bool IsAlwaysOnline() const;
virtual bool IsOnline() const;
virtual void SetOnlineStatus(bool isOnline = TRUE);
virtual void SetOnlineStatus(bool isOnline = true);
virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds);
virtual void DisableAutoCheckOnlineStatus();
virtual void SetWellKnownHost(const wxString& hostname, int port);
@@ -205,7 +205,7 @@ private:
static HRASCONN FindActiveConnection();
// notify the application about status change
void NotifyApp(bool connected, bool fromOurselves = FALSE) const;
void NotifyApp(bool connected, bool fromOurselves = false) const;
// destroy the thread data and the thread itself
void CleanUpThreadData();
@@ -630,14 +630,14 @@ void wxDialUpManagerMSW::OnDialProgress(RASCONNSTATE rasconnstate,
ms_dialer = NULL;
NotifyApp(FALSE /* !connected */, TRUE /* we dialed ourselves */);
NotifyApp(false /* !connected */, true /* we dialed ourselves */);
}
else if ( rasconnstate == RASCS_Connected )
{
ms_isConnected = TRUE;
ms_isConnected = true;
ms_dialer = NULL;
NotifyApp(TRUE /* connected */, TRUE /* we dialed ourselves */);
NotifyApp(true /* connected */, true /* we dialed ourselves */);
}
}
@@ -707,13 +707,13 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
bool async)
{
// check preconditions
wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") );
if ( ms_hRasConnection )
{
wxFAIL_MSG(wxT("there is already an active connection"));
return TRUE;
return true;
}
// get the default ISP if none given
@@ -728,7 +728,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
// no known ISPs, abort
wxLogError(_("Failed to connect: no ISP to dial."));
return FALSE;
return false;
case 1:
// only one ISP, choose it
@@ -757,7 +757,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
if ( !entryName )
{
// cancelled by user
return FALSE;
return false;
}
}
}
@@ -782,7 +782,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
{
wxLogError(_("Failed to connect: missing username/password."));
return FALSE;
return false;
}
}
else
@@ -853,16 +853,16 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
ms_dialer = NULL;
return FALSE;
return false;
}
// for async dialing, we're not yet connected
if ( !async )
{
ms_isConnected = TRUE;
ms_isConnected = true;
}
return TRUE;
return true;
}
bool wxDialUpManagerMSW::IsDialing() const
@@ -875,7 +875,7 @@ bool wxDialUpManagerMSW::CancelDialing()
if ( !GetDialer() )
{
// silently ignore
return FALSE;
return false;
}
wxASSERT_MSG( ms_hRasConnection, wxT("dialing but no connection?") );
@@ -887,7 +887,7 @@ bool wxDialUpManagerMSW::CancelDialing()
bool wxDialUpManagerMSW::HangUp()
{
wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") );
// we may terminate either the connection we initiated or another one which
// is active now
@@ -907,7 +907,7 @@ bool wxDialUpManagerMSW::HangUp()
{
wxLogError(_("Cannot hang up - no active dialup connection."));
return FALSE;
return false;
}
DWORD dwRet = ms_pfnRasHangUp(hRasConn);
@@ -917,15 +917,15 @@ bool wxDialUpManagerMSW::HangUp()
GetErrorString(dwRet).c_str());
}
ms_isConnected = FALSE;
ms_isConnected = false;
return TRUE;
return true;
}
bool wxDialUpManagerMSW::IsAlwaysOnline() const
{
// assume no permanent connection by default
bool isAlwaysOnline = FALSE;
bool isAlwaysOnline = false;
// try to use WinInet functions
@@ -962,7 +962,7 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
bool wxDialUpManagerMSW::IsOnline() const
{
wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") );
if ( IsAlwaysOnline() )
{
@@ -977,7 +977,7 @@ bool wxDialUpManagerMSW::IsOnline() const
}
else
{
// return TRUE if there is at least one active connection
// return true if there is at least one active connection
return FindActiveConnection() != 0;
}
}
@@ -991,12 +991,12 @@ void wxDialUpManagerMSW::SetOnlineStatus(bool isOnline)
bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
{
wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
wxCHECK_MSG( IsOk(), false, wxT("using uninitialized wxDialUpManager") );
if ( m_autoCheckLevel++ )
{
// already checking
return TRUE;
return true;
}
bool ok = ms_pfnRasConnectionNotification != 0;
@@ -1010,12 +1010,12 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
if ( m_hThread != 0 )
{
if ( ::ResumeThread(m_hThread) != (DWORD)-1 )
return TRUE;
return true;
// we're leaving a zombie thread... but what else can we do?
wxLogLastError(wxT("ResumeThread(RasThread)"));
ok = FALSE;
ok = false;
}
}
@@ -1025,7 +1025,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
if ( ok )
{
// first create an event to wait on
m_data->hEventRas = CreateEvent
m_data->hEventRas = ::CreateEvent
(
NULL, // security attribute (default)
FALSE, // manual reset (no, it is automatic)
@@ -1036,7 +1036,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
{
wxLogLastError(wxT("CreateEvent(RasStatus)"));
ok = FALSE;
ok = false;
}
}
@@ -1046,7 +1046,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
// here avoids problems with missing the event if wxDialUpManagerMSW
// is created and destroyed immediately, before wxRasStatusWindowProc
// starts waiting on the event
m_data->hEventQuit = CreateEvent
m_data->hEventQuit = ::CreateEvent
(
NULL, // default security
TRUE, // manual event
@@ -1059,7 +1059,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
CleanUpThreadData();
ok = FALSE;
ok = false;
}
}
@@ -1078,7 +1078,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
CleanUpThreadData();
ok = FALSE;
ok = false;
}
// and subclass it
@@ -1130,7 +1130,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
}
else
{
return TRUE;
return true;
}
}
@@ -1144,7 +1144,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
}
m_timerStatusPolling.Start(nSeconds * 1000);
return TRUE;
return true;
}
void wxDialUpManagerMSW::DisableAutoCheckOnlineStatus()
@@ -1202,10 +1202,10 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
handles[0] = data->hEventRas;
handles[1] = data->hEventQuit;
bool cont = TRUE;
bool cont = true;
while ( cont )
{
DWORD dwRet = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
DWORD dwRet = ::WaitForMultipleObjects(2, handles, FALSE, INFINITE);
switch ( dwRet )
{
@@ -1216,7 +1216,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
break;
case WAIT_OBJECT_0 + 1:
cont = FALSE;
cont = false;
break;
default: