search for X11 headers in paths under /usr/local before those under /usr (#9477)

[wxWidgets.git] / samples / dialup / nettest.cpp

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 8613901499bafc62b4d463f79537eda098dfc4b2..0ad2bd433035546fd17bd696a6d2662dd738c3d9 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -155,12 +150,15 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `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"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window
     // Create the main application window
     MyFrame *frame = new MyFrame(_T("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
     SetTopWindow(frame);
 
     // Init dial up manager


@@ -170,17 +168,21 @@ bool MyApp::OnInit()
     {
         wxLogError(wxT("The sample can't run on this system."));
 
     {
         wxLogError(wxT("The sample can't run on this system."));
 

+#if wxUSE_LOG

         wxLog::GetActiveTarget()->Flush();
         wxLog::GetActiveTarget()->Flush();

+#endif // wxUSE_LOG

 
         // do it here, OnExit() won't be called
         delete m_dial;
 
 
         // do it here, OnExit() won't be called
         delete m_dial;
 

-        return FALSE;
+        return false;

     }
 
     }
 

+#if wxUSE_STATUSBAR

     frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
     frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);

+#endif // wxUSE_STATUSBAR

 
 

-    return TRUE;
+    return true;

 }
 
 int MyApp::OnExit()
 }
 
 int MyApp::OnExit()


@@ -216,7 +218,7 @@ void MyApp::OnConnected(wxDialUpEvent& event)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // 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)

 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;


@@ -238,10 +240,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... 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);
     // 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 +253,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 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")
 }
 
 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);
 }
 
     wxMessageBox(msg, wxT("About NetTest"), wxOK | wxICON_INFORMATION, this);
 }


@@ -266,7 +270,7 @@ void MyFrame::OnHangUp(wxCommandEvent& WXUNUSED(event))
 {
     if ( wxGetApp().GetDialer()->HangUp() )
     {
 {
     if ( wxGetApp().GetDialer()->HangUp() )
     {

-        wxLogStatus(this, wxT("Connection was succesfully terminated."));
+        wxLogStatus(this, wxT("Connection was successfully terminated."));

     }
     else
     {
     }
     else
     {


@@ -328,13 +332,15 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
 
 void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(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;
 
 
     bool isOnline = wxGetApp().GetDialer()->IsOnline();
     if ( s_isOnline != (int)isOnline )
     {
         s_isOnline = isOnline;
 

+#if wxUSE_STATUSBAR

         SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
         SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);

+#endif // wxUSE_STATUSBAR

     }
 }
     }
 }