don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 616ef99d80f091ae9611d5972f6f638c498ba036..f4d1711fe519180db35495ed0048943e74a37ccd 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -9,15 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 // Settings common to both executables: determines whether
 #endif
 
 // Settings common to both executables: determines whether


@@ -25,195 +33,197 @@
 
 #include "ddesetup.h"
 
 
 #include "ddesetup.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #include "mondrian.xpm"
 #endif
 
 #include "client.h"
 
 #include "mondrian.xpm"
 #endif
 
 #include "client.h"
 

-MyFrame *frame = NULL;
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
+    EVT_MENU(CLIENT_EXECUTE, MyFrame::OnExecute)
+    EVT_MENU(CLIENT_POKE, MyFrame::OnPoke)
+    EVT_MENU(CLIENT_REQUEST, MyFrame::OnRequest)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+

 char ipc_buffer[4000];
 wxListBox *the_list = NULL;
 
 MyConnection *the_connection = NULL;
 char ipc_buffer[4000];
 wxListBox *the_list = NULL;
 
 MyConnection *the_connection = NULL;

-MyClient *my_client ;
+MyClient *my_client;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------

 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 bool MyApp::OnInit()
 {
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 bool MyApp::OnInit()
 {

-  // Create the main frame window
-  frame = new MyFrame(NULL, "Client", wxPoint(400, 0), wxSize(400, 300));
+    // service name (DDE classes) or port number (TCP/IP based classes)
+    wxString service = IPC_SERVICE;
+
+    // ignored under DDE, host name in TCP/IP based classes
+    wxString hostName = "localhost";
+
+    if (argc > 1)
+        service = argv[1];
+    if (argc > 2)
+        hostName = argv[2];
+
+    // Create a new client
+    my_client = new MyClient;
+
+    // suppress the log messages from MakeConnection()
+    {
+        wxLogNull nolog;
+        the_connection = (MyConnection *)
+            my_client->MakeConnection(hostName, service, IPC_TOPIC);
+
+        while ( !the_connection )
+        {
+            if ( wxMessageBox("Failed to make connection to server.\nRetry?",
+                              "Client Demo Error",
+                              wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
+            {
+                // no server
+                return FALSE;
+            }
+
+            the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");
+        }
+    }
+
+    if (!the_connection->StartAdvise(IPC_ADVISE_NAME))
+        wxMessageBox("StartAdvise failed", "Client Demo Error");
+
+    // Create the main frame window
+    (new MyFrame(NULL, "Client"))->Show(TRUE);

 
 

-  // Give it an icon
-  frame->SetIcon(wxICON(mondrian));
+    return TRUE;
+}

 
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+int MyApp::OnExit()
+{
+    if (the_connection)
+    {
+        the_connection->Disconnect();
+        delete the_connection;
+        the_connection = NULL;
+    }

 
 

-  file_menu->Append(CLIENT_EXECUTE, "Execute");
-  file_menu->Append(CLIENT_REQUEST, "Request");
-  file_menu->Append(CLIENT_POKE, "Poke");
-  file_menu->Append(CLIENT_QUIT, "Quit");
+    // will delete the connection too
+    // Update: Seems it didn't delete the_connection, because there's a leak.
+    // Deletion is now explicitly done a few lines up.
+    delete my_client;

 
 

-  wxMenuBar *menu_bar = new wxMenuBar;

 
 

-  menu_bar->Append(file_menu, "File");

 
 

-  // Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
+    return 0;
+}

 
 

-  // Make a panel
-  frame->panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 250));
-  the_list = new wxListBox(frame->panel, CLIENT_LISTBOX, wxPoint(5, 5), wxSize(150, 120));
-  the_list->Append("Apple");
-  the_list->Append("Pear");
-  the_list->Append("Orange");
-  the_list->Append("Banana");
-  the_list->Append("Fruit");
+// Define my frame constructor
+MyFrame::MyFrame(wxFrame *frame, const wxString& title)
+        : wxFrame(frame, -1, title, wxDefaultPosition, wxSize(300, 200))
+{
+    // Give it an icon
+    SetIcon(wxICON(mondrian));

 
 

-  frame->panel->Fit();
-  frame->Fit();
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-  wxString server = "4242";
+    file_menu->Append(CLIENT_EXECUTE, "&Execute\tCtrl-E");
+    file_menu->Append(CLIENT_REQUEST, "&Request\tCtrl-R");
+    file_menu->Append(CLIENT_POKE, "&Poke\tCtrl-P");
+    file_menu->Append(CLIENT_QUIT, "&Quit\tCtrl-Q");

 
 

-#if wxUSE_DDE_FOR_SAMPLE
-  wxString hostName = wxGetHostName();
-#else
-  wxString hostName = "localhost";
-#endif
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-  if (argc > 1)
-    server = argv[1];
-  if (argc > 2)
-    hostName = argv[2];
-
-  // Create a new client
-  my_client = new MyClient;
-  the_connection = (MyConnection *)my_client->MakeConnection(hostName, server, "IPC TEST");
-
-  if (!the_connection)
-  {
-    wxMessageBox("Failed to make connection to server", "Client Demo Error");
-#ifdef __WXMSW__
-//    extern void wxPrintDDEError();
-//    wxPrintDDEError();
-#endif
-    return FALSE;
-  }
-  if (!the_connection->StartAdvise("Item"))
-    wxMessageBox("StartAdvise failed", "Client Demo Error");
+    menu_bar->Append(file_menu, "&File");

 
 

-  frame->Show(TRUE);
+    // Associate the menu bar with the frame
+    SetMenuBar(menu_bar);

 
 

-  return TRUE;
-}
-
-int MyApp::OnExit()
-{
-    if (my_client)
-      delete my_client ;
-
-    return 0;
-}
-
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
-    EVT_MENU(CLIENT_EXECUTE, MyFrame::OnExecute)
-    EVT_MENU(CLIENT_POKE, MyFrame::OnPoke)
-    EVT_MENU(CLIENT_REQUEST, MyFrame::OnRequest)
-    EVT_CLOSE(MyFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-// Define my frame constructor
-MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
-  wxFrame(frame, -1, title, pos, size)
-{
-    panel = NULL;
+    // Make a listbox which shows the choices made in the server
+    the_list = new wxListBox(this, CLIENT_LISTBOX, wxPoint(5, 5));
+    the_list->Append("Apple");
+    the_list->Append("Pear");
+    the_list->Append("Orange");
+    the_list->Append("Banana");
+    the_list->Append("Fruit");

 }
 
 void MyFrame::OnExecute(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnExecute(wxCommandEvent& event)
 {

-      if (the_connection)
+    if (the_connection)

         if (!the_connection->Execute("Hello from the client!"))
         if (!the_connection->Execute("Hello from the client!"))

-          wxMessageBox("Execute failed", "Client Demo Error");
+            wxMessageBox("Execute failed", "Client Demo Error");

 }
 
 void MyFrame::OnPoke(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnPoke(wxCommandEvent& event)
 {

-      if (the_connection)
+    if (the_connection)

         if (!the_connection->Poke("An item", "Some data to poke at the server!"))
         if (!the_connection->Poke("An item", "Some data to poke at the server!"))

-          wxMessageBox("Poke failed", "Client Demo Error");
+            wxMessageBox("Poke failed", "Client Demo Error");

 }
 
 void MyFrame::OnRequest(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnRequest(wxCommandEvent& event)
 {

-      if (the_connection)
-      {
+    if (the_connection)
+    {

         char *data = the_connection->Request("An item");
         if (data)
         char *data = the_connection->Request("An item");
         if (data)

-          wxMessageBox(data, "Client: Request", wxOK);
+            wxMessageBox(data, "Client: Request", wxOK);

         else
         else

-          wxMessageBox("Request failed", "Client Demo Error");
-      }
+            wxMessageBox("Request failed", "Client Demo Error");
+    }

 }
 
 void MyFrame::OnExit(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnExit(wxCommandEvent& event)
 {

-  if (the_connection)
-    the_connection->Disconnect();
-
-  this->Destroy();
-}
-
-// Define the behaviour for the frame closing
-void MyFrame::OnCloseWindow(wxCloseEvent& event)
-{
-  if (the_connection)
-  {
-    the_connection->Disconnect();
-  }
-  this->Destroy();
-}
-
-MyClient::MyClient(void)
-{
-}
-
-wxConnectionBase *MyClient::OnMakeConnection(void)
-{
-  return new MyConnection;
+    Close();

 }
 
 }
 

-MyConnection::MyConnection(void):wxConnection(ipc_buffer, 3999)
+wxConnectionBase *MyClient::OnMakeConnection()

 {
 {

+    return new MyConnection;

 }
 
 }
 

-MyConnection::~MyConnection(void)
+MyConnection::MyConnection()
+            : wxConnection(ipc_buffer, WXSIZEOF(ipc_buffer))

 {
 {

-  the_connection = NULL;

 }
 
 bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
 {
 }
 
 bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
 {

-  if (the_list)
-  {
-    int n = the_list->FindString(data);
-    if (n > -1)
-      the_list->SetSelection(n);
-  }
-  return TRUE;
+    if (the_list)
+    {
+        int n = the_list->FindString(data);
+        if (n > -1)
+            the_list->SetSelection(n);
+    }
+    return TRUE;

 }
 
 bool MyConnection::OnDisconnect()
 {
 }
 
 bool MyConnection::OnDisconnect()
 {

-    frame->Destroy();
-
-    the_connection = NULL;
-    delete this;
+    wxWindow *win = wxTheApp->GetTopWindow();
+    if ( win )
+        win->Destroy();

 
     return TRUE;
 }
 
     return TRUE;
 }