Better MGL fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index c6a0a84576074acc0e8a8577279c90213e87d46f..1e73ccb6dc54ea78ab58b1e37bcc011c08581ec7 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -48,7 +48,7 @@ IMPLEMENT_APP(hvApp)
 
 hvApp::hvApp()
 {
 
 hvApp::hvApp()
 {

-#if hvUSE_IPC
+#if wxUSE_IPC

     m_server = NULL;
 #endif
 }
     m_server = NULL;
 #endif
 }


@@ -76,7 +76,7 @@ bool hvApp::OnInit()
     bool hasWindowName = false;
     bool createServer = false;
 
     bool hasWindowName = false;
     bool createServer = false;
 

-#if hvUSE_IPC
+#if wxUSE_IPC

     m_server = NULL;
 #endif
 
     m_server = NULL;
 #endif
 


@@ -159,7 +159,7 @@ bool hvApp::OnInit()
             wxOPEN | wxFILE_MUST_EXIST,
             NULL);
 
             wxOPEN | wxFILE_MUST_EXIST,
             NULL);
 

-        if (!s.IsEmpty())
+        if (!s.empty())

         {
             book[0] = s;
             bookCount = 1;
         {
             book[0] = s;
             bookCount = 1;


@@ -167,7 +167,7 @@ bool hvApp::OnInit()
     }
 #endif
 
     }
 #endif
 

-#if hvUSE_IPC
+#if wxUSE_IPC

 
     if ( createServer )
     {
 
     if ( createServer )
     {


@@ -186,7 +186,7 @@ bool hvApp::OnInit()
         wxUnusedVar(createServer);
     }
 
         wxUnusedVar(createServer);
     }
 

-#endif  // hvUSE_IPC
+#endif  // wxUSE_IPC

 
     //now add help
     wxInitAllImageHandlers();
 
     //now add help
     wxInitAllImageHandlers();


@@ -229,7 +229,7 @@ bool hvApp::OnInit()
 
 int hvApp::OnExit()
 {
 
 int hvApp::OnExit()
 {

-#if hvUSE_IPC
+#if wxUSE_IPC

     wxObjectList::compatibility_iterator node = m_connections.GetFirst();
     while (node)
     {
     wxObjectList::compatibility_iterator node = m_connections.GetFirst();
     while (node)
     {


@@ -401,7 +401,7 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
         return wxNullBitmap;
 }
 
         return wxNullBitmap;
 }
 

-#if hvUSE_IPC
+#if wxUSE_IPC

 
 wxConnectionBase *hvServer::OnAcceptConnection(const wxString& topic)
 {
 
 wxConnectionBase *hvServer::OnAcceptConnection(const wxString& topic)
 {


@@ -521,4 +521,4 @@ bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
     return true;
 }
 
     return true;
 }
 

-#endif // #if hvUSE_IPC
+#endif // #if wxUSE_IPC

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index ded9b29dbe47ff27dd4c363d1b7c0aec615f1dd7..436f802a2cab35ada1c28ea5eb1473cc3c200f38 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -16,20 +16,10 @@
 #pragma interface "help.cpp"
 #endif
 
 #pragma interface "help.cpp"
 #endif
 

-#define hvVERSION 1.03
-
-// If 1, start a server to allow this to be used
-// as an external help viewer.
-#if ( defined(__WXMAC__) || defined(__WXMGL__) ) && !defined(__UNIX__)
-#define hvUSE_IPC 0
-#else
-#define hvUSE_IPC 1
-#endif
+#define hvVERSION 1.04

 
 

-#if hvUSE_IPC
+#if wxUSE_IPC

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

-
-class hvConnection;

 class hvServer;
 #endif
 
 class hvServer;
 #endif
 


@@ -59,7 +49,7 @@ public:
     /// Returns the help controller.
     wxHtmlHelpController* GetHelpController() { return m_helpController; }
 
     /// Returns the help controller.
     wxHtmlHelpController* GetHelpController() { return m_helpController; }
 

-#if hvUSE_IPC
+#if wxUSE_IPC

     /// Returns the list of connections.
     wxList& GetConnections() { return m_connections; }
 #endif
     /// Returns the list of connections.
     wxList& GetConnections() { return m_connections; }
 #endif


@@ -67,14 +57,14 @@ public:
 private:
     wxHtmlHelpController*   m_helpController;
 
 private:
     wxHtmlHelpController*   m_helpController;
 

-#if hvUSE_IPC
+#if wxUSE_IPC

     wxList                  m_connections;
     hvServer*               m_server;
 #endif
 
 };
 
     wxList                  m_connections;
     hvServer*               m_server;
 #endif
 
 };
 

-#if hvUSE_IPC
+#if wxUSE_IPC

 class hvConnection : public wxConnection
 {
 public:
 class hvConnection : public wxConnection
 {
 public: