projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...
[wxWidgets.git]
/
include
/
wx
/
cshelp.h
diff --git
a/include/wx/cshelp.h
b/include/wx/cshelp.h
index 89caf0084e58854299eda41a6e1804b15c09d2e3..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
@@
-21,7
+21,11
@@
#if wxUSE_HELP
#include "wx/help.h"
#if wxUSE_HELP
#include "wx/help.h"
+
+#include "wx/hashmap.h"
+#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#include "wx/bmpbuttn.h"
+#endif
// ----------------------------------------------------------------------------
// classes used to implement context help UI
// ----------------------------------------------------------------------------
// classes used to implement context help UI
@@
-37,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);
@@
-50,12
+54,13
@@
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)
};
+#if wxUSE_BMPBUTTON
/*
* wxContextHelpButton
* You can add this to your dialogs (especially on non-Windows platforms)
/*
* wxContextHelpButton
* You can add this to your dialogs (especially on non-Windows platforms)
@@
-74,10
+79,12
@@
public:
void OnContextHelp(wxCommandEvent& event);
private:
void OnContextHelp(wxCommandEvent& event);
private:
- DECLARE_
CLASS
(wxContextHelpButton)
+ DECLARE_
DYNAMIC_CLASS_NO_COPY
(wxContextHelpButton)
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};
+#endif
+
// ----------------------------------------------------------------------------
// classes used to implement context help support
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// classes used to implement context help support
// ----------------------------------------------------------------------------
@@
-110,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;
@@
-134,6
+141,9
@@
private:
static wxHelpProvider *ms_helpProvider;
};
static wxHelpProvider *ms_helpProvider;
};
+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
// control (if any) in a tooltip
// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
// only plain text help strings and shows the string associated with the
// control (if any) in a tooltip
@@
-150,8
+160,8
@@
public:
protected:
// we use 2 hashes for storing the help strings associated with windows
// and the ids
protected:
// we use 2 hashes for storing the help strings associated with windows
// and the ids
- wx
StringHashTable
m_hashWindows,
- m_hashIds;
+ wx
LongToStringHashMap
m_hashWindows,
+
m_hashIds;
};
// wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports
};
// wxHelpControllerHelpProvider is an implementation of wxHelpProvider which supports
@@
-174,6
+184,8
@@
public:
protected:
wxHelpControllerBase* m_helpController;
protected:
wxHelpControllerBase* m_helpController;
+
+ DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)
};
// Convenience function for turning context id into wxString
};
// Convenience function for turning context id into wxString