Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=8733
This commit is contained in:
Rom Walton 2005-10-21 02:16:11 +00:00
parent ecbdcdc45a
commit 1109d56384
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -13279,3 +13279,13 @@ Charlie 20 Oct 2005
mac_installer/
release_boinc.sh
Rom 20 Oct 2005
Bug Fix: Some versions of Windows do not support RAS by default and so
wxWidgets complains when it can't find it. What is worse is we end up
dereferencing a null pointer when somebody tries to bring up the
options dialog. If we detect the null pointer disable all the
controls on the networking/communications tab.
clientgui/
MainFrame.cpp, .h

42
clientgui/MainFrame.cpp
View File

@ -222,8 +222,12 @@ CMainFrame::CMainFrame(wxString strTitle) :
// Prefetch and Load Wininet.dll so that any calls to
// wxDialUpManager->IsAlwaysOnline happen quicker.
m_WININET.Load(wxT("WININET"));
m_pDialupManager = wxDialUpManager::Create();
wxASSERT(m_pDialupManager->IsOk());
if (m_RASAPI32.Load(wxT("RASAPI32"))) {
m_pDialupManager = wxDialUpManager::Create();
wxASSERT(m_pDialupManager->IsOk());
} else {
m_pDialupManager = NULL;
}
#endif
m_pRefreshStateTimer = new wxTimer(this, ID_REFRESHSTATETIMER);
@ -269,9 +273,6 @@ CMainFrame::~CMainFrame() {
wxASSERT(m_pMenubar);
wxASSERT(m_pNotebook);
wxASSERT(m_pStatusbar);
#ifdef __WXMSW__
wxASSERT(m_pDialupManager);
#endif
SaveState();
@ -309,7 +310,6 @@ CMainFrame::~CMainFrame() {
delete m_pDialupManager;
#endif
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::~CMainFrame - Function End"));
}
@ -1080,10 +1080,6 @@ void CMainFrame::OnOptionsOptions(wxCommandEvent& WXUNUSED(event)) {
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(pDlg);
#ifdef __WXMSW__
wxASSERT(m_pDialupManager);
#endif
// General Tab
pDlg->m_LanguageSelectionCtrl->Append(wxGetApp().GetSupportedLanguages());
@ -1093,12 +1089,27 @@ void CMainFrame::OnOptionsOptions(wxCommandEvent& WXUNUSED(event)) {
#ifdef __WXMSW__
// Connection Tab
m_pDialupManager->GetISPNames(astrDialupConnections);
if (m_pDialupManager) {
m_pDialupManager->GetISPNames(astrDialupConnections);
pDlg->m_DialupConnectionsCtrl->Append(astrDialupConnections);
pDlg->SetDefaultConnectionType(m_iNetworkConnectionType);
pDlg->SetDefaultDialupConnection(m_strNetworkDialupConnectionName);
pDlg->SetDefaultDialupPromptCredentials(m_bNetworkDialupPromptCredentials);
pDlg->m_DialupConnectionsCtrl->Append(astrDialupConnections);
pDlg->SetDefaultConnectionType(m_iNetworkConnectionType);
pDlg->SetDefaultDialupConnection(m_strNetworkDialupConnectionName);
pDlg->SetDefaultDialupPromptCredentials(m_bNetworkDialupPromptCredentials);
} else {
pDlg->m_DialupConnectionsCtrl->Append(astrDialupConnections);
pDlg->SetDefaultConnectionType(m_iNetworkConnectionType);
pDlg->SetDefaultDialupConnection(m_strNetworkDialupConnectionName);
pDlg->SetDefaultDialupPromptCredentials(m_bNetworkDialupPromptCredentials);
pDlg->m_NetworkAutomaticDetectionCtrl->Disable();
pDlg->m_NetworkUseLANCtrl->Disable();
pDlg->m_NetworkUseDialupCtrl->Disable();
pDlg->m_DialupConnectionsCtrl->Disable();
pDlg->m_DialupSetDefaultCtrl->Disable();
pDlg->m_DialupClearDefaultCtrl->Disable();
pDlg->m_DialupPromptCredentials->Disable();
}
#endif
// Proxy Tabs
@ -1465,7 +1476,6 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) {
wxTimeSpan tsLastDialupRequest;
wxTimeSpan tsFirstDialupDisconnectEvent;
wxASSERT(m_pDialupManager->IsOk());
if (m_pDialupManager && pDoc) {
// Update the always online flag every 60 seconds. This call is expensive
// on slow machines.

1
clientgui/MainFrame.h
View File

@ -117,6 +117,7 @@ private:
CStatusBar* m_pStatusbar;
#ifdef __WXMSW__
wxDynamicLibrary m_WININET;
wxDynamicLibrary m_RASAPI32;
wxDialUpManager* m_pDialupManager;
#endif
wxString m_strBaseTitle;