partially reverted Robert's changes, did it more cleanly

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

diff --git a/include/wx/access.h b/include/wx/access.h
index 1480538eed4ac22d941ca404586594a91db3f378..e5b99406c840828b4b1a2c7d6ea535d6f8f715ad 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ACCESSBASE_H_
 #define _WX_ACCESSBASE_H_
 
 #ifndef _WX_ACCESSBASE_H_
 #define _WX_ACCESSBASE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "accessbase.h"
 #endif
 
     #pragma interface "accessbase.h"
 #endif
 


@@ -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,


@@ -225,6 +225,9 @@ typedef enum
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxAccessible;
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxAccessible;

+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxPoint;
+class WXDLLEXPORT wxRect;

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


@@ -237,10 +240,12 @@ public:
 
         // Can return either a child object, or an integer
         // representing the child element, starting from 1.
 
         // 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 +259,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).


@@ -344,7 +349,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);