Removed some deprecated usage

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-19 17:24:06 +00:00
parent 9750481f36
commit 09a1dffa32
8 changed files with 35 additions and 29 deletions
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -20,11 +20,15 @@

 // If 1, start a server to allow this to be used
 // as an external help viewer.
+<<<<<<< helpview.h
+#define hvUSE_IPC 0
+=======
 #if defined(__WXMAC__) && !defined(__UNIX__)
 #define hvUSE_IPC 0
 #else
 #define hvUSE_IPC 1
 #endif
+>>>>>>> 1.5

 #if hvUSE_IPC
 #include <wx/ipc.h>