always let the multiline text control process the Enter key presses

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

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 92b727abb56f902b4334eade3a6653d7f0ddf78e..91a173313d326374367d14cab987aed4ea086c51 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -32,7 +32,7 @@
 // we're using TCP/IP or real DDE.
 #include "ddesetup.h"
 
 // we're using TCP/IP or real DDE.
 #include "ddesetup.h"
 

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

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -74,7 +74,7 @@ bool MyApp::OnInit()
     (new MyFrame(NULL, "Server"))->Show(TRUE);
 
     // service name (DDE classes) or port number (TCP/IP based classes)
     (new MyFrame(NULL, "Server"))->Show(TRUE);
 
     // service name (DDE classes) or port number (TCP/IP based classes)

-    wxString service = "4242";
+    wxString service = IPC_SERVICE;

 
     if (argc > 1)
         service = argv[1];
 
     if (argc > 1)
         service = argv[1];


@@ -99,10 +99,8 @@ int MyApp::OnExit()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)

-       : wxFrame(frame, -1, title)
+       : wxFrame(frame, -1, title, wxDefaultPosition, wxSize(350, 250))

 {
 {

-    panel = NULL;
-

     CreateStatusBar();
 
     // Give it an icon
     CreateStatusBar();
 
     // Give it an icon


@@ -111,7 +109,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(SERVER_EXIT, "&Exit");
+    file_menu->Append(SERVER_EXIT, "&Quit\tCtrl-Q");

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
 
     wxMenuBar *menu_bar = new wxMenuBar;
 


@@ -120,29 +118,25 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     // Associate the menu bar with the frame
     SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     SetMenuBar(menu_bar);
 

-    // Make a panel
-    panel = new wxPanel(this);
-    wxListBox *list = new wxListBox(panel, SERVER_LISTBOX, wxPoint(5, 5));
+    // Make a listbox
+    wxListBox *list = new wxListBox(this, SERVER_LISTBOX, wxPoint(5, 5));

     list->Append("Apple");
     list->Append("Pear");
     list->Append("Orange");
     list->Append("Banana");
     list->Append("Fruit");
     list->Append("Apple");
     list->Append("Pear");
     list->Append("Orange");
     list->Append("Banana");
     list->Append("Fruit");

-
-    panel->Fit();
-    Fit();

 }
 
 // Set the client process's listbox to this item
 void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 // Set the client process's listbox to this item
 void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))
 {

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

     if (listBox)
     {
         wxString value = listBox->GetStringSelection();
         if (the_connection)
         {
     if (listBox)
     {
         wxString value = listBox->GetStringSelection();
         if (the_connection)
         {

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

         }
     }
 }
         }
     }
 }


@@ -179,10 +173,11 @@ void IPCDialogBox::OnQuit(wxCommandEvent& event)
 
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
 
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {

-    if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0)
+    if ( topic == IPC_TOPIC )

         return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer));
         return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer));

-    else
-        return NULL;
+
+    // unknown topic
+    return NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------