Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better MGL fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-30 09:24:08 +00:00
parent 73f91e1e00
commit 62d1f48bac
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/helpview/src/helpview.cpp
View File

@@ -48,7 +48,7 @@ IMPLEMENT_APP(hvApp)
hvApp::hvApp()
{
#if hvUSE_IPC
#if wxUSE_IPC
m_server = NULL;
#endif
}
@@ -76,7 +76,7 @@ bool hvApp::OnInit()
bool hasWindowName = false;
bool createServer = false;
#if hvUSE_IPC
#if wxUSE_IPC
m_server = NULL;
#endif
@@ -159,7 +159,7 @@ bool hvApp::OnInit()
wxOPEN | wxFILE_MUST_EXIST,
NULL);
if (!s.IsEmpty())
if (!s.empty())
{
book[0] = s;
bookCount = 1;
@@ -167,7 +167,7 @@ bool hvApp::OnInit()
}
#endif
#if hvUSE_IPC
#if wxUSE_IPC
if ( createServer )
{
@@ -186,7 +186,7 @@ bool hvApp::OnInit()
wxUnusedVar(createServer);
}
#endif // hvUSE_IPC
#endif // wxUSE_IPC
//now add help
wxInitAllImageHandlers();
@@ -229,7 +229,7 @@ bool hvApp::OnInit()
int hvApp::OnExit()
{
#if hvUSE_IPC
#if wxUSE_IPC
wxObjectList::compatibility_iterator node = m_connections.GetFirst();
while (node)
{
@@ -401,7 +401,7 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
return wxNullBitmap;
}
#if hvUSE_IPC
#if wxUSE_IPC
wxConnectionBase *hvServer::OnAcceptConnection(const wxString& topic)
{
@@ -521,4 +521,4 @@ bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
return true;
}
#endif // #if hvUSE_IPC
#endif // #if wxUSE_IPC

20
utils/helpview/src/helpview.h
View File

@@ -16,20 +16,10 @@
#pragma interface "help.cpp"
#endif
#define hvVERSION 1.03
#define hvVERSION 1.04
// 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
#if hvUSE_IPC
#if wxUSE_IPC
#include <wx/ipc.h>
class hvConnection;
class hvServer;
#endif
@@ -59,7 +49,7 @@ public:
/// 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
@@ -67,14 +57,14 @@ public:
private:
wxHtmlHelpController* m_helpController;
#if hvUSE_IPC
#if wxUSE_IPC
wxList m_connections;
hvServer* m_server;
#endif
};
#if hvUSE_IPC
#if wxUSE_IPC
class hvConnection : public wxConnection
{
public: