moving common code

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

diff --git a/include/wx/access.h b/include/wx/access.h
index b7b80b84fa74aa34850abe7698157f809d115a9d..2e7c77225049243f77bb16247d792409d670a71b 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -12,14 +12,14 @@
 #ifndef _WX_ACCESSBASE_H_
 #define _WX_ACCESSBASE_H_
 
 #ifndef _WX_ACCESSBASE_H_
 #define _WX_ACCESSBASE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "accessbase.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers we have to include here
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers we have to include here
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+
+#if wxUSE_ACCESSIBILITY
+

 #include "wx/variant.h"
 
 typedef enum
 #include "wx/variant.h"
 
 typedef enum


@@ -51,7 +51,7 @@ typedef enum
 
 // Role constants
 
 
 // Role constants
 

-typedef enum {  
+typedef enum {

     wxROLE_NONE,
     wxROLE_SYSTEM_ALERT,
     wxROLE_SYSTEM_ANIMATION,
     wxROLE_NONE,
     wxROLE_SYSTEM_ALERT,
     wxROLE_SYSTEM_ANIMATION,


@@ -224,17 +224,17 @@ typedef enum
 // All functions return an indication of success, failure, or not implemented.
 // ----------------------------------------------------------------------------
 
 // All functions return an indication of success, failure, or not implemented.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAccessible;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxPoint;
-class WXDLLEXPORT wxRect;
+class WXDLLIMPEXP_FWD_CORE wxAccessible;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxPoint;
+class WXDLLIMPEXP_FWD_CORE wxRect;

 class WXDLLEXPORT wxAccessibleBase : public wxObject
 {
     DECLARE_NO_COPY_CLASS(wxAccessibleBase)
 
 public:
 class WXDLLEXPORT wxAccessibleBase : public wxObject
 {
     DECLARE_NO_COPY_CLASS(wxAccessibleBase)
 
 public:

-    wxAccessibleBase(wxWindow* win): m_window(win) {};
-    virtual ~wxAccessibleBase() {};
+    wxAccessibleBase(wxWindow* win): m_window(win) {}
+    virtual ~wxAccessibleBase() {}

 
 // Overridables
 
 
 // Overridables
 


@@ -326,6 +326,7 @@ public:
     virtual wxAccStatus GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child))
          { return wxACC_NOT_IMPLEMENTED; }
 
     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:
         // Gets a variant representing the selected children
         // of this object.
         // Acceptable values:


@@ -336,6 +337,7 @@ public:
         // - a "void*" pointer to a wxAccessible child object
     virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections))
          { return wxACC_NOT_IMPLEMENTED; }
         // - a "void*" pointer to a wxAccessible child object
     virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections))
          { return wxACC_NOT_IMPLEMENTED; }

+#endif // wxUSE_VARIANT

 
 // Accessors
 
 
 // Accessors
 


@@ -367,20 +369,9 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/ole/access.h"
 
 #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
 

-#endif
-    // _WX_ACCESSBASE_H_
+#endif // wxUSE_ACCESSIBILITY
+
+#endif // _WX_ACCESSBASE_H_