// 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"
#include "wx/dialup.h"
+#ifndef __WXMSW__
+ #include "../sample.xpm"
+#endif
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// `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 wxWidgets 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);
+ frame->Show(true);
SetTopWindow(frame);
// Init dial up manager
{
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()
// 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
}
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);
}
{
if ( wxGetApp().GetDialer()->HangUp() )
{
- wxLogStatus(this, wxT("Connection was succesfully terminated."));
+ wxLogStatus(this, wxT("Connection was successfully terminated."));
}
else
{
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))
}
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';
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
}
}