X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bef8d4810dfdcf328fe4a2949c3543b38aee8bd5..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/access.h diff --git a/include/wx/access.h b/include/wx/access.h index 978987ed9d..70cbaf1389 100644 --- a/include/wx/access.h +++ b/include/wx/access.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 2003-02-12 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,14 +11,14 @@ #ifndef _WX_ACCESSBASE_H_ #define _WX_ACCESSBASE_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "accessbase.h" -#endif - // ---------------------------------------------------------------------------- // headers we have to include here // ---------------------------------------------------------------------------- +#include "wx/defs.h" + +#if wxUSE_ACCESSIBILITY + #include "wx/variant.h" typedef enum @@ -51,7 +50,7 @@ typedef enum // Role constants -typedef enum { +typedef enum { wxROLE_NONE, wxROLE_SYSTEM_ALERT, wxROLE_SYSTEM_ANIMATION, @@ -224,17 +223,17 @@ typedef enum // All functions return an indication of success, failure, or not implemented. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAccessible; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxPoint; -class WXDLLEXPORT wxRect; -class WXDLLEXPORT wxAccessibleBase : public wxObject +class WXDLLIMPEXP_FWD_CORE wxAccessible; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxPoint; +class WXDLLIMPEXP_FWD_CORE wxRect; +class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject { - DECLARE_NO_COPY_CLASS(wxAccessibleBase) + wxDECLARE_NO_COPY_CLASS(wxAccessibleBase); public: - wxAccessibleBase(wxWindow* win): m_window(win) {}; - virtual ~wxAccessibleBase() {}; + wxAccessibleBase(wxWindow* win): m_window(win) {} + virtual ~wxAccessibleBase() {} // Overridables @@ -326,6 +325,7 @@ public: virtual wxAccStatus GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child)) { return wxACC_NOT_IMPLEMENTED; } +#if wxUSE_VARIANT // Gets a variant representing the selected children // of this object. // Acceptable values: @@ -336,6 +336,7 @@ public: // - a "void*" pointer to a wxAccessible child object virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections)) { return wxACC_NOT_IMPLEMENTED; } +#endif // wxUSE_VARIANT // Accessors @@ -349,7 +350,7 @@ public: // Operations - // Each wxAccessible implementation must define this + // Each platform's implementation must define this // static void NotifyEvent(int eventType, wxWindow* window, wxAccObject objectType, // int objectId); @@ -367,20 +368,9 @@ private: #if defined(__WXMSW__) #include "wx/msw/ole/access.h" -#elif defined(__WXMOTIF__) - #include "wx/generic/access.h" -#elif defined(__WXMGL__) - #include "wx/generic/access.h" -#elif defined(__WXGTK__) - #include "wx/generic/access.h" -#elif defined(__WXX11__) - #include "wx/generic/access.h" -#elif defined(__WXMAC__) - #include "wx/generic/access.h" -#elif defined(__WXPM__) - #include "wx/generic/access.h" #endif -#endif - // _WX_ACCESSBASE_H_ +#endif // wxUSE_ACCESSIBILITY + +#endif // _WX_ACCESSBASE_H_