don't use WPARAM in the header (build fix after r59336)

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

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 9e85641a9c826b1250d6b55add5114f9e44d31ad..1221ea470574c74aa83a83461735e98d25da293d 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"
 


@@ -41,6 +36,10 @@
 
 #include "wx/dialup.h"
 
 
 #include "wx/dialup.h"
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -155,6 +154,9 @@ 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));
     // Create the main application window
     MyFrame *frame = new MyFrame(_T("Dial-up wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(450, 340));


@@ -170,7 +172,9 @@ 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;


@@ -178,7 +182,9 @@ bool MyApp::OnInit()
         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;
 }


@@ -218,6 +224,8 @@ void MyApp::OnConnected(wxDialUpEvent& event)
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {

+    SetIcon(wxICON(sample));
+

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


@@ -238,10 +246,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

 }
 
 
 }
 
 


@@ -257,7 +267,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
     msg.Printf( wxT("This is the network functions test sample.\n")
 {
     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 +276,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
     {


@@ -335,6 +345,8 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
     {
         s_isOnline = isOnline;
 
     {
         s_isOnline = isOnline;
 

+#if wxUSE_STATUSBAR

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

+#endif // wxUSE_STATUSBAR

     }
 }
     }
 }