Remove the unused code instead of commenting it out.

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

diff --git a/samples/ipc/server.h b/samples/ipc/server.h
index 81aa31697bcc30bd79f5bd768bd3810fc960102a..a81a4421cc98c5e3b7cbc04d4c6b4dd83d24a874 100644 (file)
--- a/samples/ipc/server.h
+++ b/samples/ipc/server.h
@@ -9,62 +9,96 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "connection.h"
+
+enum
+{
+    ID_START = 10000,
+    ID_DISCONNECT,
+    ID_ADVISE,
+    ID_SERVERNAME,
+};
+
 // Define a new application
-class MyApp: public wxApp
+class MyServer;
+class MyFrame;
+
+class MyApp : public wxApp
 {
-  public:
-    bool OnInit();
+public:
+    virtual bool OnInit();
+    MyFrame *GetFrame() { return m_frame; }
+
+protected:
+    MyFrame *m_frame;
 };
 
 DECLARE_APP(MyApp)
 
 // Define a new frame
-class MyFrame: public wxFrame
+class MyFrame : public wxFrame
 {
-  public:
-    wxPanel *panel;
+public:
+    MyFrame(wxFrame *frame, const wxString& title);
 
-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
+    void OnClose(wxCloseEvent& event);
 
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnExit(wxCommandEvent& event);
-    void OnListBoxClick(wxCommandEvent& event);
-DECLARE_EVENT_TABLE()
-};
+    void UpdateUI();
+    void Disconnect();
 
-class IPCDialogBox;
-class MyConnection: public wxConnection
-{
- public:
-  IPCDialogBox *dialog;
+protected:
+    wxButton* GetStart()  { return (wxButton*) FindWindow( ID_START ); }
+    wxChoice* GetServername()  { return (wxChoice*) FindWindow( ID_SERVERNAME ); }
+    wxButton* GetDisconnect()  { return (wxButton*) FindWindow( ID_DISCONNECT ); }
+    wxButton* GetAdvise()  { return (wxButton*) FindWindow( ID_ADVISE ); }
+
+
+    MyServer *m_server;
 
-  MyConnection(char *buf, int size);
-  ~MyConnection();
+    void OnStart( wxCommandEvent &event );
+    void OnServerName( wxCommandEvent &event );
+    void OnDisconnect( wxCommandEvent &event );
+    void OnAdvise( wxCommandEvent &event );
 
-  bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format);
-  char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
-  bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format);
-  bool OnStartAdvise(const wxString& topic, const wxString& item);
+    DECLARE_EVENT_TABLE()
 };
 
-class MyServer: public wxServer
+class MyConnection : public MyConnectionBase
 {
 public:
-    wxConnectionBase *OnAcceptConnection(const wxString& topic);
+    virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format);
+    virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format);
+    virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
+    virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
+    virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
+    virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format);
+    virtual bool OnDisconnect();
+
+    // topic for which we advise the client or empty if none
+    wxString m_advise;
+
+protected:
+    // the data returned by last OnRequest(): we keep it in this buffer to
+    // ensure that the pointer we return from OnRequest() stays valid
+    wxCharBuffer m_requestData;
 };
 
-class IPCDialogBox: public wxDialog
+class MyServer : public wxServer
 {
 public:
-    MyConnection *connection;
-    IPCDialogBox(wxFrame *parent, const wxString& title,
-                         const wxPoint& pos, const wxSize& size, MyConnection *the_connection);
+    MyServer();
+    virtual ~MyServer();
+
+    void Disconnect();
+    bool IsConnected() { return m_connection != NULL; }
+    MyConnection *GetConnection() { return m_connection; }
+
+    void Advise();
+    bool CanAdvise() { return m_connection && !m_connection->m_advise.empty(); }
 
-    void OnQuit(wxCommandEvent& event);
+    virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 
-DECLARE_EVENT_TABLE()
+protected:
+    MyConnection *m_connection;
 };
 
-#define SERVER_QUIT         wxID_EXIT
-#define SERVER_LISTBOX      500
-#define SERVER_QUIT_BUTTON  501