Initialise all variables

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

diff --git a/include/wx/access.h b/include/wx/access.h
index b7b80b84fa74aa34850abe7698157f809d115a9d..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,
@@ -233,8 +231,8 @@ 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
 
@@ -326,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:
@@ -336,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
 
@@ -367,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_
-