X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254a21292b0ccf234ed1dbc6acd37708672ffcc0..f29d3d6133310ab9d46bbb51bbd4f269210c7b35:/utils/helpview/src/helpview.cpp?ds=inline

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index c6a0a84576..290b2dab09 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -48,7 +44,7 @@ IMPLEMENT_APP(hvApp)
 
 hvApp::hvApp()
 {
-#if hvUSE_IPC
+#if wxUSE_IPC
     m_server = NULL;
 #endif
 }
@@ -76,7 +72,7 @@ bool hvApp::OnInit()
     bool hasWindowName = false;
     bool createServer = false;
 
-#if hvUSE_IPC
+#if wxUSE_IPC
     m_server = NULL;
 #endif
 
@@ -159,7 +155,7 @@ bool hvApp::OnInit()
             wxOPEN | wxFILE_MUST_EXIST,
             NULL);
 
-        if (!s.IsEmpty())
+        if (!s.empty())
         {
             book[0] = s;
             bookCount = 1;
@@ -167,7 +163,7 @@ bool hvApp::OnInit()
     }
 #endif
 
-#if hvUSE_IPC
+#if wxUSE_IPC
 
     if ( createServer )
     {
@@ -186,7 +182,7 @@ bool hvApp::OnInit()
         wxUnusedVar(createServer);
     }
 
-#endif  // hvUSE_IPC
+#endif  // wxUSE_IPC
 
     //now add help
     wxInitAllImageHandlers();
@@ -229,7 +225,7 @@ bool hvApp::OnInit()
 
 int hvApp::OnExit()
 {
-#if hvUSE_IPC
+#if wxUSE_IPC
     wxObjectList::compatibility_iterator node = m_connections.GetFirst();
     while (node)
     {
@@ -305,22 +301,7 @@ void hvApp::MacOpenFile(const wxString& filename)
 #define ART(artId, xpmRc) \
 if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 
-// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
-#if WXWIN_COMPATIBILITY_2_2
-#define GET_STD_ICON_FROM_APP(iconId) \
-    if ( client == wxART_MESSAGE_BOX ) \
-{ \
-    wxIcon icon = wxTheApp->GetStdIcon(iconId); \
-    if ( icon.Ok() ) \
-{ \
-    wxBitmap bmp; \
-    bmp.CopyFromIcon(icon); \
-    return bmp; \
-} \
-}
-#else
 #define GET_STD_ICON_FROM_APP(iconId)
-#endif
 
 // There are two ways of getting the standard icon: either via XPMs or via
 // wxIcon ctor. This depends on the platform:
@@ -401,7 +382,7 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
         return wxNullBitmap;
 }
 
-#if hvUSE_IPC
+#if wxUSE_IPC
 
 wxConnectionBase *hvServer::OnAcceptConnection(const wxString& topic)
 {
@@ -521,4 +502,4 @@ bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
     return true;
 }
 
-#endif // #if hvUSE_IPC
+#endif // #if wxUSE_IPC