simplify the code for extended flags handling fixing a rare bug with wxSTAY_ON_TOP...

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

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 33993489aa1cdb3051f8a5da4f0bd4f56ed8a1a0..1536ecef8adb32a3107774f53c5ffafcb900a34c 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -17,11 +17,6 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#  pragma implementation "client.cpp"
-#  pragma interface "client.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"
 


@@ -112,9 +107,9 @@ private:
 enum
 {
   // menu items
 enum
 {
   // menu items

-  CLIENT_QUIT = 1000,
-  CLIENT_ABOUT,
-  CLIENT_OPEN,
+  CLIENT_QUIT = wxID_EXIT,
+  CLIENT_ABOUT = wxID_ABOUT,
+  CLIENT_OPEN = 100,

   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,


@@ -159,6 +154,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+  if ( !wxApp::OnInit() )
+      return false;
+

   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 


@@ -290,7 +288,7 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   //
   // Connect(addr, false) will issue a nonblocking connection request
   // and return immediately. If the return value is true, then the
   //
   // Connect(addr, false) will issue a nonblocking connection request
   // and return immediately. If the return value is true, then the

-  // connection has been already succesfully established. If it is
+  // connection has been already successfully established. If it is

   // false, you must wait for the request to complete, either with
   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).
   // false, you must wait for the request to complete, either with
   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).


@@ -585,7 +583,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   wxYield();
 
   // Get the data
   wxYield();
 
   // Get the data

-  wxFile fileTest(wxT("test.url"));
+  wxFile fileTest(wxT("test.url"), wxFile::write);

   wxFileOutputStream sout(fileTest);
   if (!sout.Ok())
   {
   wxFileOutputStream sout(fileTest);
   if (!sout.Ok())
   {