use wxSizerFlags and updated CreateButtonSizer() in all generic dialogs

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

diff --git a/include/wx/access.h b/include/wx/access.h
index 1480538eed4ac22d941ca404586594a91db3f378..3d51a307cda5bd9c74fef91c31b861a7f950d44b 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -12,14 +12,12 @@
 #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"
+
 #include "wx/variant.h"
 
 typedef enum
@@ -51,7 +49,7 @@ typedef enum
 
 // Role constants
 
-typedef enum {  
+typedef enum {
     wxROLE_NONE,
     wxROLE_SYSTEM_ALERT,
     wxROLE_SYSTEM_ANIMATION,
@@ -225,22 +223,27 @@ typedef enum
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxAccessible;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxPoint;
+class WXDLLEXPORT wxRect;
 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
 
         // 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).
+        // rect is in screen coordinates.
     virtual wxAccStatus GetLocation(wxRect& WXUNUSED(rect), int WXUNUSED(elementId))
          { return wxACC_NOT_IMPLEMENTED; }
 
@@ -254,7 +257,7 @@ public:
          { 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).
@@ -321,6 +324,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:
@@ -331,6 +335,7 @@ public:
         // - a "void*" pointer to a wxAccessible child object
     virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections))
          { return wxACC_NOT_IMPLEMENTED; }
+#endif // wxUSE_VARIANT
 
 // Accessors
 
@@ -344,7 +349,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);
 
@@ -362,20 +367,7 @@ 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_
-