Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / include / wx / ipcbase.h

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index f4531f16f8cd6ac70231b89c8e09ac2b8a46be5a..178cb3b31f84c6cee890dcff5553d733368bca04 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -67,20 +67,40 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
   virtual bool Disconnect(void) = 0;
 
   // Callbacks to SERVER - override at will
   virtual bool Disconnect(void) = 0;
 
   // Callbacks to SERVER - override at will

-  virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), 
-                          int WXUNUSED(format) ) { return FALSE; };
-  virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), 
-                            int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; };
-  virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), 
-                      int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; };
-  virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) 
-                              { return FALSE; };
-  virtual bool OnStopAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) 
+  virtual bool OnExecute     ( const wxString& WXUNUSED(topic),
+                               char *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return FALSE; };
+
+  virtual char *OnRequest    ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               int *WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return (char *) NULL; };
+
+  virtual bool OnPoke        ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               wxChar *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return FALSE; };
+
+  virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item) )
+                             { return FALSE; };
+
+  virtual bool OnStopAdvise  ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item) )

                              { return FALSE; };
 
   // Callbacks to CLIENT - override at will
                              { return FALSE; };
 
   // Callbacks to CLIENT - override at will

-  virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), 
-                        int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; };
+  virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               char *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return FALSE; };

 
   // Callbacks to BOTH
 
 
   // Callbacks to BOTH