Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

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

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 0ad2bd433035546fd17bd696a6d2662dd738c3d9..5f7e025b7597b3281b98c41fa21f88ffe9df00af 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -36,6 +36,10 @@
 
 #include "wx/dialup.h"
 
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -154,12 +158,11 @@ bool MyApp::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
+    // Show it
     frame->Show(true);
-    SetTopWindow(frame);
 
     // Init dial up manager
     m_dial = wxDialUpManager::Create();
@@ -179,7 +182,7 @@ bool MyApp::OnInit()
     }
 
 #if wxUSE_STATUSBAR
-    frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
+    frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? wxT("LAN") : wxT("No LAN"), 2);
 #endif // wxUSE_STATUSBAR
 
     return true;
@@ -220,22 +223,24 @@ void MyApp::OnConnected(wxDialUpEvent& event)
 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;
 
-    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);
@@ -299,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))
@@ -314,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';
@@ -340,7 +349,7 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
         s_isOnline = isOnline;
 
 #if wxUSE_STATUSBAR
-        SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
+        SetStatusText(isOnline ? wxT("Online") : wxT("Offline"), 1);
 #endif // wxUSE_STATUSBAR
     }
 }