Define SF_UNICODE if undefined

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

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 5c3a6e226f56409954169631ca2fd96e5abdfda4..7e31dad04521e856bdb494616c5fed2c9c6effdd 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -35,6 +35,10 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if !wxUSE_DIALUP_MANAGER
+#error You must set wxUSE_DIALUP_MANAGER to 1 in setup.h!
+#endif
+

 #include "wx/dialup.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/dialup.h"
 
 // ----------------------------------------------------------------------------


@@ -65,7 +69,7 @@ public:
 private:
     wxDialUpManager *m_dial;
 
 private:
     wxDialUpManager *m_dial;
 

-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()

 };
 
 // Define a new frame type: this is going to be our main frame
 };
 
 // Define a new frame type: this is going to be our main frame


@@ -164,7 +168,7 @@ bool MyApp::OnInit()
 
     if ( !m_dial->IsOk() )
     {
 
     if ( !m_dial->IsOk() )
     {

-        wxLogError("The sample can't run on this system.");
+        wxLogError(wxT("The sample can't run on this system."));

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


@@ -189,18 +193,18 @@ int MyApp::OnExit()
 
 void MyApp::OnConnected(wxDialUpEvent& event)
 {
 
 void MyApp::OnConnected(wxDialUpEvent& event)
 {

-    const char *msg;
+    const wxChar *msg;

     if ( event.IsOwnEvent() )
     {
     if ( event.IsOwnEvent() )
     {

-        msg = event.IsConnectedEvent() ? "Successfully connected"
-                                       : "Dialing failed";
+        msg = event.IsConnectedEvent() ? wxT("Successfully connected")
+                                       : wxT("Dialing failed");

 
 

-        wxLogStatus("");
+        wxLogStatus(wxT(""));

     }
     else
     {
     }
     else
     {

-        msg = event.IsConnectedEvent() ? "Just connected!"
-                                       : "Disconnected";
+        msg = event.IsConnectedEvent() ? wxT("Just connected!")
+                                       : wxT("Disconnected");

     }
 
     wxLogMessage(msg);
     }
 
     wxLogMessage(msg);


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

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

     }
     else
     {
     }
     else
     {

-        wxLogStatus(this, "Failed to hang up.");
+        wxLogStatus(this, wxT("Failed to hang up."));

     }
 }
 
 void MyFrame::OnDial(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnDial(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogStatus(this, "Preparing to dial...");
+    wxLogStatus(this, wxT("Preparing to dial..."));

     wxYield();
     wxBeginBusyCursor();
 
     if ( wxGetApp().GetDialer()->Dial() )
     {
     wxYield();
     wxBeginBusyCursor();
 
     if ( wxGetApp().GetDialer()->Dial() )
     {

-        wxLogStatus(this, "Dialing...");
+        wxLogStatus(this, wxT("Dialing..."));

     }
     else
     {
     }
     else
     {

-        wxLogStatus(this, "Dialing attempt failed.");
+        wxLogStatus(this, wxT("Dialing attempt failed."));

     }
 
     wxEndBusyCursor();
     }
 
     wxEndBusyCursor();


@@ -291,9 +295,9 @@ void MyFrame::OnDial(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnCheck(wxCommandEvent& WXUNUSED(event))
 {
    if(wxGetApp().GetDialer()->IsOnline())
 void MyFrame::OnCheck(wxCommandEvent& WXUNUSED(event))
 {
    if(wxGetApp().GetDialer()->IsOnline())

-      wxLogMessage("Network is online.");
+      wxLogMessage(wxT("Network is online."));

    else
    else

-      wxLogMessage("Network is offline.");
+      wxLogMessage(wxT("Network is offline."));

 }
 
 void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))


@@ -302,7 +306,7 @@ void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))
     size_t nCount = wxGetApp().GetDialer()->GetISPNames(names);
     if ( nCount == 0 )
     {
     size_t nCount = wxGetApp().GetDialer()->GetISPNames(names);
     if ( nCount == 0 )
     {

-        wxLogWarning("No ISPs found.");
+        wxLogWarning(wxT("No ISPs found."));

     }
     else
     {
     }
     else
     {