applied patch 568329

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

diff --git a/samples/ipc/server.h b/samples/ipc/server.h
index 81aa31697bcc30bd79f5bd768bd3810fc960102a..ac85cd4b0d1969c4fcd332d220f3f2907245f469 100644 (file)
--- a/samples/ipc/server.h
+++ b/samples/ipc/server.h
@@ -10,41 +10,48 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application

-class MyApp: public wxApp
+class MyServer;
+class MyApp : public wxApp

 {
 {

-  public:
-    bool OnInit();
+public:
+    virtual bool OnInit();
+    virtual int OnExit();
+
+private:
+    MyServer *m_server;

 };
 
 DECLARE_APP(MyApp)
 
 // Define a new frame
 };
 
 DECLARE_APP(MyApp)
 
 // Define a new frame

-class MyFrame: public wxFrame
+class MyFrame : public wxFrame

 {
 {

-  public:
-    wxPanel *panel;
-
-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
+public:
+    MyFrame(wxFrame *frame, const wxString& title);

 
 

-    void OnCloseWindow(wxCloseEvent& event);
-    void OnExit(wxCommandEvent& event);

     void OnListBoxClick(wxCommandEvent& event);
     void OnListBoxClick(wxCommandEvent& event);

-DECLARE_EVENT_TABLE()
+    void OnExit(wxCommandEvent& event);
+
+private:
+    wxPanel *panel;
+
+    DECLARE_EVENT_TABLE()

 };
 
 class IPCDialogBox;
 };
 
 class IPCDialogBox;

-class MyConnection: public wxConnection
+class MyConnection : public wxConnection

 {
 {

- public:
-  IPCDialogBox *dialog;
+public:
+    MyConnection(char *buf, int size);
+    ~MyConnection();

 
 

-  MyConnection(char *buf, int size);
-  ~MyConnection();
+    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);

 
 

-  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);
+private:
+    IPCDialogBox *dialog;

 };
 
 class MyServer: public wxServer
 };
 
 class MyServer: public wxServer


@@ -56,15 +63,20 @@ public:
 class IPCDialogBox: public wxDialog
 {
 public:
 class IPCDialogBox: public wxDialog
 {
 public:

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

 
     void OnQuit(wxCommandEvent& event);
 
 
     void OnQuit(wxCommandEvent& event);
 

-DECLARE_EVENT_TABLE()
+private:
+    MyConnection *m_connection;
+
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#define SERVER_QUIT         wxID_EXIT
+#define SERVER_EXIT         wxID_EXIT

 #define SERVER_LISTBOX      500
 #define SERVER_QUIT_BUTTON  501
 #define SERVER_LISTBOX      500
 #define SERVER_QUIT_BUTTON  501