rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

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

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index e80c2d0ab48b1892682ae62883bd4a8d6c97f660..fc9fde211a5be0d634a49f5d6d40aae522eb259f 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -36,7 +36,7 @@
  * window for the application to display help for.
  */
 
  * window for the application to display help for.
  */
 

-class WXDLLEXPORT wxContextHelp : public wxObject
+class WXDLLIMPEXP_CORE wxContextHelp : public wxObject

 {
 public:
     wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);
 {
 public:
     wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);


@@ -65,7 +65,7 @@ private:
  * to put the application into context help mode.
  */
 
  * to put the application into context help mode.
  */
 

-class WXDLLEXPORT wxContextHelpButton : public wxBitmapButton
+class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton

 {
 public:
     wxContextHelpButton(wxWindow* parent,
 {
 public:
     wxContextHelpButton(wxWindow* parent,


@@ -106,7 +106,7 @@ private:
 // and overriding ShowHelp() but calling the base class version wouldn't work
 // any more, which forces us to use a rather ugly hack and pass the extra
 // parameters of ShowHelpAtPoint() to ShowHelp() via member variables.
 // and overriding ShowHelp() but calling the base class version wouldn't work
 // any more, which forces us to use a rather ugly hack and pass the extra
 // parameters of ShowHelpAtPoint() to ShowHelp() via member variables.

-class WXDLLEXPORT wxHelpProvider
+class WXDLLIMPEXP_CORE wxHelpProvider

 {
 public:
     // get/set the current (application-global) help provider (Set() returns
 {
 public:
     // get/set the current (application-global) help provider (Set() returns


@@ -188,7 +188,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
 // 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

-class WXDLLEXPORT wxSimpleHelpProvider : public wxHelpProvider
+class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider

 {
 public:
     // implement wxHelpProvider methods
 {
 public:
     // implement wxHelpProvider methods


@@ -212,12 +212,12 @@ protected:
 // both context identifiers and plain text help strings. If the help text is an integer,
 // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string
 // in a tooltip as per wxSimpleHelpProvider.
 // both context identifiers and plain text help strings. If the help text is an integer,
 // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string
 // in a tooltip as per wxSimpleHelpProvider.

-class WXDLLEXPORT wxHelpControllerHelpProvider : public wxSimpleHelpProvider
+class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider

 {
 public:
     // Note that it doesn't own the help controller. The help controller
     // should be deleted separately.
 {
 public:
     // Note that it doesn't own the help controller. The help controller
     // should be deleted separately.

-    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = (wxHelpControllerBase*) NULL);
+    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = NULL);

 
     // implement wxHelpProvider methods
 
 
     // implement wxHelpProvider methods
 


@@ -236,7 +236,7 @@ protected:
 };
 
 // Convenience function for turning context id into wxString
 };
 
 // Convenience function for turning context id into wxString

-WXDLLEXPORT wxString wxContextId(int id);
+WXDLLIMPEXP_CORE wxString wxContextId(int id);

 
 #endif // wxUSE_HELP
 
 
 #endif // wxUSE_HELP