don't redefine NOMINMAX if already defined (mingw32 does this apparently)

[wxWidgets.git] / include / wx / cshelp.h

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 31d6e205c309a7bdd37792dd1c197167466e0b00..9780189ffe633083a560fc16c9b32a6142fdbe8b 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -6,13 +6,13 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CSHELPH__
 #define _WX_CSHELPH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "cshelp.h"
 #endif
 
     #pragma interface "cshelp.h"
 #endif
 


@@ -41,7 +41,7 @@
 class WXDLLEXPORT wxContextHelp : public wxObject
 {
 public:
 class WXDLLEXPORT wxContextHelp : public wxObject
 {
 public:

-    wxContextHelp(wxWindow* win = NULL, bool beginHelp = TRUE);
+    wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);

     virtual ~wxContextHelp();
 
     bool BeginContextHelp(wxWindow* win);
     virtual ~wxContextHelp();
 
     bool BeginContextHelp(wxWindow* win);


@@ -54,7 +54,7 @@ public:
 
 protected:
     bool    m_inHelp;
 
 protected:
     bool    m_inHelp;

-    bool    m_status; // TRUE if the user left-clicked
+    bool    m_status; // true if the user left-clicked

 
 private:
     DECLARE_DYNAMIC_CLASS(wxContextHelp)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxContextHelp)


@@ -117,7 +117,7 @@ public:
     virtual wxString GetHelp(const wxWindowBase *window) = 0;
 
     // do show help for the given window (uses GetHelp() internally if
     virtual wxString GetHelp(const wxWindowBase *window) = 0;
 
     // do show help for the given window (uses GetHelp() internally if

-    // applicable), return TRUE if it was done or FALSE if no help available
+    // applicable), return true if it was done or false if no help available

     // for this window
     virtual bool ShowHelp(wxWindowBase *window) = 0;
 
     // for this window
     virtual bool ShowHelp(wxWindowBase *window) = 0;
 


@@ -141,8 +141,8 @@ private:
     static wxHelpProvider *ms_helpProvider;
 };
 
     static wxHelpProvider *ms_helpProvider;
 };
 

-WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
-                     wxLongToStringHashMap );
+WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
+                              wxLongToStringHashMap );

 
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the