projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Guess what: ODBC updates and build fixes.
[wxWidgets.git]
/
include
/
wx
/
helpbase.h
diff --git
a/include/wx/helpbase.h
b/include/wx/helpbase.h
index 1e7752f5c5e5b20267edf29ba098389b11320876..830925e80d1df4cd8bb8404c8e09a823f312ffca 100644
(file)
--- a/
include/wx/helpbase.h
+++ b/
include/wx/helpbase.h
@@
-9,8
+9,8
@@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifndef __HELPBASEH__
-#define __HELPBASEH__
+#ifndef _
WX
_HELPBASEH__
+#define _
WX
_HELPBASEH__
#ifdef __GNUG__
#pragma interface "helpbase.h"
#ifdef __GNUG__
#pragma interface "helpbase.h"
@@
-18,7
+18,7
@@
#include "wx/wx.h"
#include "wx/wx.h"
-#if USE_HELP
+#if
wx
USE_HELP
// Defines the API for help controllers
class WXDLLEXPORT wxHelpControllerBase: public wxObject
// Defines the API for help controllers
class WXDLLEXPORT wxHelpControllerBase: public wxObject
@@
-32,7
+32,7
@@
class WXDLLEXPORT wxHelpControllerBase: public wxObject
// Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based
// help controllers.
// Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based
// help controllers.
- virtual bool Initialize(const wxString&
file, int server
) { return FALSE; };
+ virtual bool Initialize(const wxString&
WXUNUSED(file), int WXUNUSED(server)
) { return FALSE; };
virtual bool Initialize(const wxString& file) = 0;
// If file is "", reloads file given in Initialize
virtual bool Initialize(const wxString& file) = 0;
// If file is "", reloads file given in Initialize
@@
-46,6
+46,6
@@
class WXDLLEXPORT wxHelpControllerBase: public wxObject
virtual void OnQuit(void) {};
};
virtual void OnQuit(void) {};
};
-#endif // USE_HELP
+#endif //
wx
USE_HELP
#endif
#endif
- // __HELPBASEH__
+ // _
WX
_HELPBASEH__