Make it possible to use svn-find-native-eols script without svn checkout.

[wxWidgets.git] / samples / sockets / client.cpp

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index c435c1e9ccdc88e34f10b6aea7a41bf747769000..b3389bd4ebe0e0110c5c10ab4aa3ccea2796ad69 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -39,7 +39,9 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif

 
 // --------------------------------------------------------------------------
 // classes
 
 // --------------------------------------------------------------------------
 // classes


@@ -188,9 +190,8 @@ bool MyApp::OnInit()
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 

-  // Show it and tell the application that it's our main window
+  // Show it

   frame->Show(true);
   frame->Show(true);

-  SetTopWindow(frame);

 
   // success
   return true;
 
   // success
   return true;


@@ -206,11 +207,11 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon
                              wxDefaultPosition, wxSize(300, 200))
 {
   // Give the frame an icon

-  SetIcon(wxICON(mondrian));
+  SetIcon(wxICON(sample));

 
   // Make menus
   m_menuFile = new wxMenu();
 
   // Make menus
   m_menuFile = new wxMenu();

-  m_menuFile->Append(CLIENT_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog"));
+  m_menuFile->Append(CLIENT_ABOUT, _("&About\tCtrl-A"), _("Show about dialog"));

   m_menuFile->AppendSeparator();
   m_menuFile->Append(CLIENT_QUIT, _("E&xit\tAlt-X"), _("Quit client"));
 
   m_menuFile->AppendSeparator();
   m_menuFile->Append(CLIENT_QUIT, _("E&xit\tAlt-X"), _("Quit client"));
 


@@ -611,9 +612,9 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
     }
 
     // Print the contents type and file size
     }
 
     // Print the contents type and file size

-    wxLogMessage("Contents type: %s\nFile size: %i\nStarting to download...",
+    wxLogMessage("Contents type: %s\nFile size: %lu\nStarting to download...",

                  url.GetProtocol().GetContentType(),
                  url.GetProtocol().GetContentType(),

-                 data->GetSize());
+                 static_cast<unsigned long>( data->GetSize() ));

 
     // Get the data
     wxStringOutputStream sout;
 
     // Get the data
     wxStringOutputStream sout;