Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/access.h b/include/wx/access.h
index 1480538eed4ac22d941ca404586594a91db3f378..70cbaf1389b013facc441cb773d18264f0ef458a 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,14 +11,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 +50,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,23 +223,28 @@ 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 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:
 
 public:

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

 
 // Overridables
 
         // Can return either a child object, or an integer
         // representing the child element, starting from 1.
 
 // Overridables
 
         // Can return either a child object, or an integer
         // representing the child element, starting from 1.

+        // pt is in screen coordinates.

     virtual wxAccStatus HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject))
          { return wxACC_NOT_IMPLEMENTED; }
 
         // Returns the rectangle for this object (id = 0) or a child element (id > 0).
     virtual wxAccStatus HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject))
          { return wxACC_NOT_IMPLEMENTED; }
 
         // Returns the rectangle for this object (id = 0) or a child element (id > 0).

+        // rect is in screen coordinates.

     virtual wxAccStatus GetLocation(wxRect& WXUNUSED(rect), int WXUNUSED(elementId))
          { return wxACC_NOT_IMPLEMENTED; }
 
     virtual wxAccStatus GetLocation(wxRect& WXUNUSED(rect), int WXUNUSED(elementId))
          { return wxACC_NOT_IMPLEMENTED; }
 


@@ -254,7 +258,7 @@ public:
          { return wxACC_NOT_IMPLEMENTED; }
 
         // Gets the number of children.
          { return wxACC_NOT_IMPLEMENTED; }
 
         // Gets the number of children.

-    virtual wxAccStatus GetChildCount(int* WXUNUSED(childId))
+    virtual wxAccStatus GetChildCount(int* WXUNUSED(childCount))

          { return wxACC_NOT_IMPLEMENTED; }
 
         // Gets the specified child (starting from 1).
          { return wxACC_NOT_IMPLEMENTED; }
 
         // Gets the specified child (starting from 1).


@@ -321,6 +325,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:


@@ -331,6 +336,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
 


@@ -344,7 +350,7 @@ public:
 
 // Operations
 
 
 // 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);
 
     // static void NotifyEvent(int eventType, wxWindow* window, wxAccObject objectType,
     //                         int objectId);
 


@@ -362,20 +368,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_