Fix so the value given to wxTextEntryDialog::SetValue will actually be

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

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 3dfb36562fed1c6fda1073d85b86d17302210622..46909bfed1f8b511b7d05b989c40bc57cecb6aa5 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        server.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        server.cpp

-// Purpose:     DDE sample: server
+// Purpose:     IPC sample: server

 // Author:      Julian Smart
 // Modified by:
 // Created:     25/01/99
 // Author:      Julian Smart
 // Modified by:
 // Created:     25/01/99


@@ -9,105 +9,132 @@
 // 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
 // we're using TCP/IP or real DDE.
 #endif
 
 // Settings common to both executables: determines whether
 // we're using TCP/IP or real DDE.

-

 #include "ddesetup.h"
 
 #include "ddesetup.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-#include "mondrian.xpm"
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+    #include "mondrian.xpm"

 #endif
 
 #include "server.h"
 
 #endif
 
 #include "server.h"
 

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

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU   (SERVER_EXIT, MyFrame::OnExit)
+    EVT_LISTBOX(SERVER_LISTBOX, MyFrame::OnListBoxClick)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(IPCDialogBox, wxDialog)
+    EVT_BUTTON(SERVER_QUIT_BUTTON, IPCDialogBox::OnQuit)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+

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

-MyServer *my_server ;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------

 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-  // Create the main frame window
-  frame = new MyFrame(NULL, "Server", wxDefaultPosition, wxSize(400, 500));
+    // Create the main frame window
+    (new MyFrame(NULL, "Server"))->Show(TRUE);

 
 

-  frame->CreateStatusBar();
+    // service name (DDE classes) or port number (TCP/IP based classes)
+    wxString service = "4242";

 
 

-  // Give it an icon
-  frame->SetIcon(wxICON(mondrian));
+    if (argc > 1)
+        service = argv[1];

 
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+    // Create a new server
+    m_server = new MyServer;
+    m_server->Create(service);
+
+    return TRUE;
+}
+
+int MyApp::OnExit()
+{
+    delete m_server;

 
 

-  file_menu->Append(SERVER_QUIT, "&Exit");
+    return 0;
+}

 
 

-  wxMenuBar *menu_bar = new wxMenuBar;
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------

 
 

-  menu_bar->Append(file_menu, "&File");
+// Define my frame constructor
+MyFrame::MyFrame(wxFrame *frame, const wxString& title)
+       : wxFrame(frame, -1, title)
+{
+    panel = NULL;

 
 

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

 
 

-  // Make a panel
-  frame->panel = new wxPanel(frame, 0, 0, 400, 250);
-  wxListBox *list = new wxListBox(frame->panel, SERVER_LISTBOX,
-                                  wxPoint(5, 5), wxSize(150, 120));
-  list->Append("Apple");
-  list->Append("Pear");
-  list->Append("Orange");
-  list->Append("Banana");
-  list->Append("Fruit");
+    // Give it an icon
+    SetIcon(wxICON(mondrian));

 
 

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

 
 

-  wxString server_name = "4242";
-  if (argc > 1)
-    server_name = argv[1];
+    file_menu->Append(SERVER_EXIT, "&Exit");

 
 

-  // Create a new server
-  my_server = new MyServer;
-  my_server->Create(server_name);
-  frame->Show(TRUE);
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-  return TRUE;
-}
+    menu_bar->Append(file_menu, "&File");

 
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(SERVER_QUIT, MyFrame::OnExit)
-    EVT_CLOSE(MyFrame::OnCloseWindow)
-    EVT_LISTBOX(SERVER_LISTBOX, MyFrame::OnListBoxClick)
-END_EVENT_TABLE()
+    // Associate the menu bar with the frame
+    SetMenuBar(menu_bar);

 
 

-// 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 panel
+    panel = new wxPanel(this);
+    wxListBox *list = new wxListBox(panel, SERVER_LISTBOX, wxPoint(5, 5));
+    list->Append("Apple");
+    list->Append("Pear");
+    list->Append("Orange");
+    list->Append("Banana");
+    list->Append("Fruit");

 
 

-void MyFrame::OnExit(wxCommandEvent& event)
-{
-    if (my_server)
-        delete my_server;
-    this->Destroy();
+    panel->Fit();
+    Fit();

 }
 
 // Set the client process's listbox to this item
 }
 
 // Set the client process's listbox to this item

-void MyFrame::OnListBoxClick(wxCommandEvent& event)
+void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))

 {
     wxListBox* listBox = (wxListBox*) panel->FindWindow(SERVER_LISTBOX);
     if (listBox)
 {
     wxListBox* listBox = (wxListBox*) panel->FindWindow(SERVER_LISTBOX);
     if (listBox)


@@ -115,84 +142,101 @@ void MyFrame::OnListBoxClick(wxCommandEvent& event)
         wxString value = listBox->GetStringSelection();
         if (the_connection)
         {
         wxString value = listBox->GetStringSelection();
         if (the_connection)
         {

-            the_connection->Advise("Item", (char*) (const char*) value);
+            the_connection->Advise("Item", (wxChar *)value.c_str());

         }
     }
 }
 
         }
     }
 }
 

-void MyFrame::OnCloseWindow(wxCloseEvent& event)
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))

 {
 {

-    if (my_server)
-        delete my_server;
-    this->Destroy();
+    Close(TRUE);

 }
 
 }
 

-BEGIN_EVENT_TABLE(IPCDialogBox, wxDialog)
-    EVT_BUTTON(SERVER_QUIT_BUTTON, IPCDialogBox::OnQuit)
-END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// IPCDialogBox
+// ----------------------------------------------------------------------------

 
 

-IPCDialogBox::IPCDialogBox(wxFrame *parent, const wxString& title,
-                         const wxPoint& pos, const wxSize& size, MyConnection *the_connection):
-                     wxDialog(parent, -1, title, pos, size)
+IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title,
+                           const wxPoint& pos, const wxSize& size,
+                           MyConnection *connection)
+            : wxDialog(parent, -1, title, pos, size)

 {
 {

-  connection = the_connection;
-  (void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection", wxPoint(5, 5));
-  Fit();
+    m_connection = connection;
+    (void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection",
+                       wxPoint(5, 5));
+    Fit();

 }
 
 void IPCDialogBox::OnQuit(wxCommandEvent& event)
 {
 }
 
 void IPCDialogBox::OnQuit(wxCommandEvent& event)
 {

-  connection->Disconnect();
-  delete connection;
+    m_connection->Disconnect();
+    delete m_connection;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// MyServer
+// ----------------------------------------------------------------------------
+

 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {

-  if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0)
-    return new MyConnection(ipc_buffer, 4000);
-  else
-    return NULL;
+    if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0)
+        return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer));
+    else
+        return NULL;

 }
 
 }
 

-MyConnection::MyConnection(char *buf, int size):wxConnection(buf, size)
+// ----------------------------------------------------------------------------
+// MyConnection
+// ----------------------------------------------------------------------------
+
+MyConnection::MyConnection(char *buf, int size)
+            : wxConnection(buf, size)

 {
 {

-  dialog = new IPCDialogBox(frame, "Connection", wxPoint(100, 100), wxSize(500, 500), this);
-  dialog->Show(TRUE);
-  the_connection = this;
+    dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), "Connection",
+                              wxPoint(100, 100), wxSize(500, 500), this);
+    dialog->Show(TRUE);
+    the_connection = this;

 }
 
 }
 

-MyConnection::~MyConnection(void)
+MyConnection::~MyConnection()

 {
 {

-  if (the_connection)
-  {
-    dialog->Destroy();
-    the_connection = NULL;
-  }
+    if (the_connection)
+    {
+        dialog->Destroy();
+        the_connection = NULL;
+    }

 }
 
 }
 

-bool MyConnection::OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format)
+bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
+                             char *data,
+                             int WXUNUSED(size),
+                             wxIPCFormat WXUNUSED(format))

 {
 {

-  char buf[300];
-  sprintf(buf, "Execute command: %s", data);
-  frame->SetStatusText(buf);
-  return TRUE;
+    wxLogStatus("Execute command: %s", data);
+    return TRUE;

 }
 
 }
 

-bool MyConnection::OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
+bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
+                          const wxString& item,
+                          char *data,
+                          int WXUNUSED(size),
+                          wxIPCFormat WXUNUSED(format))

 {
 {

-  char buf[300];
-  sprintf(buf, "Poke command: %s", data);
-  frame->SetStatusText(buf);
-  return TRUE;
+    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
+    return TRUE;

 }
 
 }
 

-char *MyConnection::OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format)
+char *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
+                              const wxString& WXUNUSED(item),
+                              int * WXUNUSED(size),
+                              wxIPCFormat WXUNUSED(format))

 {
 {

-  return "Here, have your data, client!";
+    return "Here, have your data, client!";

 }
 
 }
 

-bool MyConnection::OnStartAdvise(const wxString& topic, const wxString& item)
+bool MyConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
+                                 const wxString& WXUNUSED(item))

 {
 {

-  return TRUE;
+    return TRUE;

 }
 
 }