added wxUSE_VARIANT guards

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

diff --git a/include/wx/access.h b/include/wx/access.h
index 5b29ada9bac4b21466b2d3f11112714160638c01..3d51a307cda5bd9c74fef91c31b861a7f950d44b 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -16,6 +16,8 @@
 // headers we have to include here
 // ----------------------------------------------------------------------------
 
 // headers we have to include here
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+

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


@@ -322,6 +324,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:


@@ -332,6 +335,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
 


@@ -363,20 +367,7 @@ 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
     // _WX_ACCESSBASE_H_
 #endif
 
 #endif
     // _WX_ACCESSBASE_H_

-