Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 8e68d35171b0e55d8be6ff196c00601bdc226af7..6fb77735949d05fbd2f4402929941b82b892d43f 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99

-// RCS-ID:      $Id$

 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -36,7 +35,7 @@
 
 #include "wx/dialup.h"
 
 
 #include "wx/dialup.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -161,9 +160,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("Dial-up wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     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);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // Init dial up manager
     m_dial = wxDialUpManager::Create();
 
     // Init dial up manager
     m_dial = wxDialUpManager::Create();


@@ -235,7 +233,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(NetTest_EnumISP, wxT("&Enumerate ISPs...\tCtrl-E"));
     menuFile->Append(NetTest_Check, wxT("&Check connection status...\tCtrl-C"));
     menuFile->AppendSeparator();
     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, wxT("&About...\tCtrl-A"), wxT("Show about dialog"));
+    menuFile->Append(NetTest_About, wxT("&About\tCtrl-A"), wxT("Show about dialog"));

     menuFile->AppendSeparator();
     menuFile->Append(NetTest_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
 
     menuFile->AppendSeparator();
     menuFile->Append(NetTest_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));