X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d08c0e77d0b577937cd59a278ee7c4e3dec525a..0c63cc6e4c7f1d489e91ea6dd7fffc19b0abaec9:/samples/dialup/nettest.cpp diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp index 1816214cc8..e317e100ac 100644 --- a/samples/dialup/nettest.cpp +++ b/samples/dialup/nettest.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: net.cpp -// Purpose: wxWindows sample demonstrating network-related functions +// Purpose: wxWidgets sample demonstrating network-related functions // Author: Vadim Zeitlin // Modified by: // Created: 07.07.99 @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "nettest.cpp" - #pragma interface "nettest.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -30,7 +25,7 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// need because it includes almost all "standard" wxWidgets headers #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -41,6 +36,10 @@ #include "wx/dialup.h" +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -91,7 +90,7 @@ public: void OnIdle(wxIdleEvent& event); private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -113,7 +112,7 @@ enum }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyApp, wxApp) @@ -121,7 +120,7 @@ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_DIALUP_DISCONNECTED(MyApp::OnConnected) END_EVENT_TABLE() -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -137,7 +136,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_IDLE(MyFrame::OnIdle) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -155,13 +154,15 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main application window - MyFrame *frame = new MyFrame(_T("Dial-up wxWindows demo"), + MyFrame *frame = new MyFrame(wxT("Dial-up wxWidgets demo"), wxPoint(50, 50), wxSize(450, 340)); - // Show it and tell the application that it's our main window - frame->Show(TRUE); - SetTopWindow(frame); + // Show it + frame->Show(true); // Init dial up manager m_dial = wxDialUpManager::Create(); @@ -170,17 +171,21 @@ bool MyApp::OnInit() { wxLogError(wxT("The sample can't run on this system.")); +#if wxUSE_LOG wxLog::GetActiveTarget()->Flush(); +#endif // wxUSE_LOG // do it here, OnExit() won't be called delete m_dial; - return FALSE; + return false; } - frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2); +#if wxUSE_STATUSBAR + frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? wxT("LAN") : wxT("No LAN"), 2); +#endif // wxUSE_STATUSBAR - return TRUE; + return true; } int MyApp::OnExit() @@ -216,32 +221,36 @@ void MyApp::OnConnected(wxDialUpEvent& event) // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { + SetIcon(wxICON(sample)); + // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(NetTest_Dial, _T("&Dial\tCtrl-D"), _T("Dial default ISP")); - menuFile->Append(NetTest_HangUp, _T("&HangUp\tCtrl-H"), _T("Hang up modem")); + menuFile->Append(NetTest_Dial, wxT("&Dial\tCtrl-D"), wxT("Dial default ISP")); + menuFile->Append(NetTest_HangUp, wxT("&HangUp\tCtrl-H"), wxT("Hang up modem")); menuFile->AppendSeparator(); - menuFile->Append(NetTest_EnumISP, _T("&Enumerate ISPs...\tCtrl-E")); - menuFile->Append(NetTest_Check, _T("&Check connection status...\tCtrl-C")); + menuFile->Append(NetTest_EnumISP, wxT("&Enumerate ISPs...\tCtrl-E")); + menuFile->Append(NetTest_Check, wxT("&Check connection status...\tCtrl-C")); menuFile->AppendSeparator(); - menuFile->Append(NetTest_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); + menuFile->Append(NetTest_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(NetTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + menuFile->Append(NetTest_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, _T("&File")); + menuBar->Append(menuFile, wxT("&File")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); +#if wxUSE_STATUSBAR // create status bar and fill the LAN field CreateStatusBar(3); static const int widths[3] = { -1, 100, 60 }; SetStatusWidths(3, widths); +#endif // wxUSE_STATUSBAR } @@ -249,15 +258,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; msg.Printf( wxT("This is the network functions test sample.\n") - wxT("© 1999 Vadim Zeitlin") ); + wxT("(c) 1999 Vadim Zeitlin") ); wxMessageBox(msg, wxT("About NetTest"), wxOK | wxICON_INFORMATION, this); } @@ -266,7 +275,7 @@ void MyFrame::OnHangUp(wxCommandEvent& WXUNUSED(event)) { if ( wxGetApp().GetDialer()->HangUp() ) { - wxLogStatus(this, wxT("Connection was succesfully terminated.")); + wxLogStatus(this, wxT("Connection was successfully terminated.")); } else { @@ -295,9 +304,13 @@ void MyFrame::OnDial(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCheck(wxCommandEvent& WXUNUSED(event)) { if(wxGetApp().GetDialer()->IsOnline()) + { wxLogMessage(wxT("Network is online.")); + } else + { wxLogMessage(wxT("Network is offline.")); + } } void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event)) @@ -310,7 +323,7 @@ void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event)) } else { - wxString msg = _T("Known ISPs:\n"); + wxString msg = wxT("Known ISPs:\n"); for ( size_t n = 0; n < nCount; n++ ) { msg << names[n] << '\n'; @@ -328,13 +341,15 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event) void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) { - static int s_isOnline = -1; // not TRUE nor FALSE + static int s_isOnline = -1; // not true nor false bool isOnline = wxGetApp().GetDialer()->IsOnline(); if ( s_isOnline != (int)isOnline ) { s_isOnline = isOnline; - SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1); +#if wxUSE_STATUSBAR + SetStatusText(isOnline ? wxT("Online") : wxT("Offline"), 1); +#endif // wxUSE_STATUSBAR } }