mention wxTreeItemId change

[wxWidgets.git] / samples / access / accesstest.cpp

diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 0d7ee018ca5d11eedbf2ce605468f280dbab161e..c07fa9f9416a66169eed70ea063561a9aab6b087 100644 (file)
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/access.h"
 #include "wx/splitter.h"
 
 #include "wx/access.h"
 #include "wx/splitter.h"

+#include "wx/cshelp.h"

 
 #ifdef __WXMSW__
 #include "windows.h"
 
 #ifdef __WXMSW__
 #include "windows.h"


@@ -93,6 +94,8 @@ public:
     // Recursively give information about an object
     void LogObject(int indent, IAccessible* obj);
 
     // Recursively give information about an object
     void LogObject(int indent, IAccessible* obj);
 

+    // Get info for a child (id > 0) or object (id == 0)
+    void GetInfo(IAccessible* accessible, int id, wxString& name, wxString& role);

 private:
     wxTextCtrl* m_textCtrl;
 
 private:
     wxTextCtrl* m_textCtrl;
 


@@ -150,6 +153,13 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    // Note: JAWS for Windows will only speak the context-sensitive
+    // help if you use this help provider:
+    // wxHelpProvider::Set(new wxHelpControllerHelpProvider(m_helpController)).
+    // JAWS does not seem to be getting the help text from
+    // the wxAccessible object.
+    wxHelpProvider::Set(new wxSimpleHelpProvider());
+

     // create the main application window
     MyFrame *frame = new MyFrame(_T("AccessTest wxWindows App"),
                                  wxPoint(50, 50), wxSize(450, 340));
     // create the main application window
     MyFrame *frame = new MyFrame(_T("AccessTest wxWindows App"),
                                  wxPoint(50, 50), wxSize(450, 340));


@@ -172,14 +182,12 @@ public:
             // Gets the name of the specified object.
     virtual wxAccStatus GetName(int childId, wxString* name)
     {
             // Gets the name of the specified object.
     virtual wxAccStatus GetName(int childId, wxString* name)
     {

-#if 1

         if (childId == wxACC_SELF)
         {
             * name = wxT("Julian's Frame");
             return wxACC_OK;
         }
         else
         if (childId == wxACC_SELF)
         {
             * name = wxT("Julian's Frame");
             return wxACC_OK;
         }
         else

-#endif

             return wxACC_NOT_IMPLEMENTED;
     }
 };
             return wxACC_NOT_IMPLEMENTED;
     }
 };


@@ -202,6 +210,92 @@ public:
     }
 };
 
     }
 };
 

+class SplitterWindowAccessible: public wxWindowAccessible
+{
+public:
+    SplitterWindowAccessible(wxWindow* win): wxWindowAccessible(win) {}
+
+            // Gets the name of the specified object.
+    virtual wxAccStatus GetName(int childId, wxString* name);
+
+        // Can return either a child object, or an integer
+        // representing the child element, starting from 1.
+    virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject);
+
+        // Returns the rectangle for this object (id = 0) or a child element (id > 0).
+    virtual wxAccStatus GetLocation(wxRect& rect, int elementId);
+
+        // Navigates from fromId to toId/toObject.
+    virtual wxAccStatus Navigate(wxNavDir navDir, int fromId,
+                int* toId, wxAccessible** toObject);
+
+        // Gets the number of children.
+    virtual wxAccStatus GetChildCount(int* childCount);
+
+        // Gets the specified child (starting from 1).
+        // If *child is NULL and return value is wxACC_OK,
+        // this means that the child is a simple element and
+        // not an accessible object.
+    virtual wxAccStatus GetChild(int childId, wxAccessible** child);
+
+        // Gets the parent, or NULL.
+    virtual wxAccStatus GetParent(wxAccessible** parent);
+
+        // Performs the default action. childId is 0 (the action for this object)
+        // or > 0 (the action for a child).
+        // Return wxACC_NOT_SUPPORTED if there is no default action for this
+        // window (e.g. an edit control).
+    virtual wxAccStatus DoDefaultAction(int childId);
+
+        // Gets the default action for this object (0) or > 0 (the action for a child).
+        // Return wxACC_OK even if there is no action. actionName is the action, or the empty
+        // string if there is no action.
+        // The retrieved string describes the action that is performed on an object,
+        // not what the object does as a result. For example, a toolbar button that prints
+        // a document has a default action of "Press" rather than "Prints the current document."
+    virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName);
+
+        // Returns the description for this object or a child.
+    virtual wxAccStatus GetDescription(int childId, wxString* description);
+
+        // Returns help text for this object or a child, similar to tooltip text.
+    virtual wxAccStatus GetHelpText(int childId, wxString* helpText);
+
+        // Returns the keyboard shortcut for this object or child.
+        // Return e.g. ALT+K
+    virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut);
+
+        // Returns a role constant.
+    virtual wxAccStatus GetRole(int childId, wxAccRole* role);
+
+        // Returns a state constant.
+    virtual wxAccStatus GetState(int childId, long* state);
+
+        // Returns a localized string representing the value for the object
+        // or child.
+    virtual wxAccStatus GetValue(int childId, wxString* strValue);
+
+        // Selects the object or child.
+    virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags);
+
+        // Gets the window with the keyboard focus.
+        // If childId is 0 and child is NULL, no object in
+        // this subhierarchy has the focus.
+        // If this object has the focus, child should be 'this'.
+    virtual wxAccStatus GetFocus(int* childId, wxAccessible** child);
+
+        // Gets a variant representing the selected children
+        // of this object.
+        // Acceptable values:
+        // - a null variant (IsNull() returns TRUE)
+        // - a list variant (GetType() == wxT("list"))
+        // - an integer representing the selected child element,
+        //   or 0 if this object is selected (GetType() == wxT("long"))
+        // - a "void*" pointer to a wxAccessible child object
+    virtual wxAccStatus GetSelections(wxVariant* selections);
+
+};
+

 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------


@@ -223,7 +317,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(AccessTest_About, _T("&About...\tF1"), _T("Show about dialog"));
+    helpMenu->Append(AccessTest_About, _T("&About..."), _T("Show about dialog"));

 
     menuFile->Append(AccessTest_Query, _T("Query"), _T("Query the window hierarchy"));
     menuFile->AppendSeparator();
 
     menuFile->Append(AccessTest_Query, _T("Query"), _T("Query the window hierarchy"));
     menuFile->AppendSeparator();


@@ -238,33 +332,35 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 

-#if 1 // wxUSE_STATUSBAR
+#if 0 // wxUSE_STATUSBAR

     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWindows!"));
 #endif // wxUSE_STATUSBAR
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWindows!"));
 #endif // wxUSE_STATUSBAR
 

+

     wxSplitterWindow* splitter = new wxSplitterWindow(this, -1);
     wxSplitterWindow* splitter = new wxSplitterWindow(this, -1);

-    splitter->CreateAccessible();
+    splitter->SetAccessible(new SplitterWindowAccessible(splitter));

 
     wxListBox* listBox = new wxListBox(splitter, -1);
 
     wxListBox* listBox = new wxListBox(splitter, -1);

+    listBox->Append(wxT("Cabbages"));
+    listBox->Append(wxT("Kings"));
+    listBox->Append(wxT("Sealing wax"));
+    listBox->Append(wxT("Strings"));

     listBox->CreateAccessible();
     listBox->CreateAccessible();

+    listBox->SetHelpText(wxT("This is a sample wxWindows listbox, with a number of items in it."));

 
     m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
         wxDefaultSize, wxTE_MULTILINE);
     m_textCtrl->CreateAccessible();
 
     m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
         wxDefaultSize, wxTE_MULTILINE);
     m_textCtrl->CreateAccessible();

+    m_textCtrl->SetHelpText(wxT("This is a sample wxWindows multiline text control."));

 
     splitter->SplitHorizontally(listBox, m_textCtrl, 150);
 
 #if 0
 
     splitter->SplitHorizontally(listBox, m_textCtrl, 150);
 
 #if 0

-#if 1
-    wxListBox* listBox = new wxListBox(this, -1);
-    //listBox->SetAccessible(new wxAccessible(listBox));
-#else

     wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this, -1);
     scrolledWindow->SetAccessible(new ScrolledWindowAccessible(scrolledWindow));
 #endif
     wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this, -1);
     scrolledWindow->SetAccessible(new ScrolledWindowAccessible(scrolledWindow));
 #endif

-#endif

 }
 
 
 }
 
 


@@ -297,8 +393,67 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
     }
     if (accessibleFrame)
     {
     }
     if (accessibleFrame)
     {

-        Log(wxT("Got an IAccessible for the frame."));
+        //Log(wxT("Got an IAccessible for the frame."));

         LogObject(0, accessibleFrame);
         LogObject(0, accessibleFrame);

+        Log(wxT("Checking children using AccessibleChildren()..."));
+
+        // Now check the AccessibleChildren function works OK
+        long childCount = 0;
+        if (S_OK != accessibleFrame->get_accChildCount(& childCount))
+        {
+            Log(wxT("Could not get number of children."));
+            accessibleFrame->Release();
+            return;
+        }
+        else if (childCount == 0)
+        {
+            Log(wxT("No children."));
+            accessibleFrame->Release();
+            return;
+        }
+        
+
+        long obtained = 0;
+        VARIANT *var = new VARIANT[childCount];
+        int i;
+        for (i = 0; i < childCount; i++)
+        {
+            VariantInit(& (var[i]));
+            var[i].vt = VT_DISPATCH;
+        }
+        
+        if (S_OK == AccessibleChildren(accessibleFrame, 0, childCount, var, &obtained))
+        {
+            for (i = 0; i < childCount; i++)
+            {
+                IAccessible* childAccessible = NULL;
+                if (var[i].pdispVal)
+                {
+                    if (var[i].pdispVal->QueryInterface(IID_IAccessible, (LPVOID*) & childAccessible) == S_OK)
+                    {
+                        var[i].pdispVal->Release();
+                        
+                        wxString name, role;
+                        GetInfo(childAccessible, 0, name, role);
+                        wxString str;
+                        str.Printf(wxT("Found child %s/%s"), name.c_str(), role.c_str());
+                        Log(str);
+                        childAccessible->Release();
+                    }
+                    else
+                    {
+                        var[i].pdispVal->Release();
+                    }
+                }
+            }
+        }
+        else
+        {
+            Log(wxT("AccessibleChildren failed."));
+        }
+        delete[] var;
+
+

         accessibleFrame->Release();
     }
 }
         accessibleFrame->Release();
     }
 }


@@ -319,56 +474,16 @@ void MyFrame::Log(const wxString& text)
 // Recursively give information about an object
 void MyFrame::LogObject(int indent, IAccessible* obj)
 {
 // Recursively give information about an object
 void MyFrame::LogObject(int indent, IAccessible* obj)
 {

-    VARIANT var;
-    VariantInit(& var);
-    var.vt = VT_I4;
-    var.lVal = 0;
-    
-    BSTR bStrName = 0;
-    HRESULT hResult = obj->get_accName(var, & bStrName);
-    
-    if (hResult == S_OK)
-    {
-        wxString strName(wxConvertStringFromOle(bStrName));
-        SysFreeString(bStrName);
-        
-        wxString str;
-        str.Printf(wxT("Name: %s"), strName.c_str());
-        str.Pad(indent, wxT(' '), FALSE);
-        Log(str);
-    }
-    else
-    {
-        wxString str;
-        str.Printf(wxT("NO NAME"));
-        str.Pad(indent, wxT(' '), FALSE);
-        Log(str);
-    }
-    
-    VARIANT varRole;
-    VariantInit(& varRole);
-    
-    hResult = obj->get_accRole(var, & varRole);
-    
-    if (hResult == S_OK && varRole.vt == VT_I4)
+    wxString name, role;
+    if (indent == 0)

     {
     {

-        wxChar buf[256];
-        GetRoleText(varRole.lVal, buf, 256);
-        
-        wxString strRole(buf);
-        
+        GetInfo(obj, 0, name, role);
+

         wxString str;
         wxString str;

-        str.Printf(wxT("Role: %s"), strRole.c_str());
+        str.Printf(wxT("Name = %s; Role = %s"), name.c_str(), role.c_str());

         str.Pad(indent, wxT(' '), FALSE);
         Log(str);
     }
         str.Pad(indent, wxT(' '), FALSE);
         Log(str);
     }

-    else
-    {
-        wxString str;
-        str.Printf(wxT("NO ROLE"));
-        str.Pad(indent, wxT(' '), FALSE);
-        Log(str);
-    }    

 
     long childCount = 0;
     if (S_OK == obj->get_accChildCount(& childCount))
 
     long childCount = 0;
     if (S_OK == obj->get_accChildCount(& childCount))


@@ -377,11 +492,19 @@ void MyFrame::LogObject(int indent, IAccessible* obj)
         str.Printf(wxT("There are %d children."), (int) childCount);
         str.Pad(indent, wxT(' '), FALSE);
         Log(str);
         str.Printf(wxT("There are %d children."), (int) childCount);
         str.Pad(indent, wxT(' '), FALSE);
         Log(str);

+        Log(wxT(""));

     }
 
     int i;
     for (i = 1; i <= childCount; i++)
     {
     }
 
     int i;
     for (i = 1; i <= childCount; i++)
     {

+        GetInfo(obj, i, name, role);
+
+        wxString str;
+        str.Printf(wxT("%d) Name = %s; Role = %s"), i, name.c_str(), role.c_str());
+        str.Pad(indent, wxT(' '), FALSE);
+        Log(str);
+

         VARIANT var;
         VariantInit(& var);
         var.vt = VT_I4;
         VARIANT var;
         VariantInit(& var);
         var.vt = VT_I4;


@@ -389,75 +512,591 @@ void MyFrame::LogObject(int indent, IAccessible* obj)
         IDispatch* pDisp = NULL;
         IAccessible* childObject = NULL;
 
         IDispatch* pDisp = NULL;
         IAccessible* childObject = NULL;
 

-        BSTR bStrName = 0;
-        HRESULT hResult = obj->get_accName(var, & bStrName);
-
-        if (hResult == S_OK)
+        if (S_OK == obj->get_accChild(var, & pDisp) && pDisp)

         {
         {

-            wxString strName(wxConvertStringFromOle(bStrName));
-            SysFreeString(bStrName);
-

             wxString str;
             wxString str;

-            str.Printf(wxT("Name: %s"), strName.c_str());
+            str.Printf(wxT("This is a real object."));

             str.Pad(indent+4, wxT(' '), FALSE);
             Log(str);
             str.Pad(indent+4, wxT(' '), FALSE);
             Log(str);

+
+            if (pDisp->QueryInterface(IID_IAccessible, (LPVOID*) & childObject) == S_OK)
+            {
+                LogObject(indent + 4, childObject);
+                childObject->Release();
+            }
+            pDisp->Release();

         }
         else
         {
             wxString str;
         }
         else
         {
             wxString str;

-            str.Printf(wxT("NO NAME"));
+            str.Printf(wxT("This is an element."));

             str.Pad(indent+4, wxT(' '), FALSE);
             Log(str);
         }
             str.Pad(indent+4, wxT(' '), FALSE);
             Log(str);
         }

+        // Log(wxT(""));
+    }

 
 

-        VARIANT varRole;
-        VariantInit(& varRole);
+}

 
 

-        hResult = obj->get_accRole(var, & varRole);
+// Get info for a child (id > 0) or object (id == 0)
+void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString& role)
+{
+    VARIANT var;
+    VariantInit(& var);
+    var.vt = VT_I4;
+    var.lVal = id;
+    
+    BSTR bStrName = 0;
+    HRESULT hResult = accessible->get_accName(var, & bStrName);
+    
+    if (hResult == S_OK)
+    {
+        name = wxConvertStringFromOle(bStrName);
+        SysFreeString(bStrName);
+    }
+    else
+    {
+        name = wxT("NO NAME");
+    }
+    
+    VARIANT varRole;
+    VariantInit(& varRole);
+    
+    hResult = accessible->get_accRole(var, & varRole);
+    
+    if (hResult == S_OK && varRole.vt == VT_I4)
+    {
+        wxChar buf[256];
+        GetRoleText(varRole.lVal, buf, 256);
+        
+        role = buf;
+    }
+    else
+    {
+        role = wxT("NO ROLE");
+    }    
+}
+
+/*
+ * SplitterWindowAccessible implementation
+ */

 
 

-        if (hResult == S_OK && varRole.vt == VT_I4)
+// Gets the name of the specified object.
+wxAccStatus SplitterWindowAccessible::GetName(int childId, wxString* name)
+{
+    if (childId == wxACC_SELF)
+    {
+        * name = wxT("Splitter window");
+        return wxACC_OK;
+    }
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())

         {
         {

-            wxChar buf[256];
-            GetRoleText(varRole.lVal, buf, 256);
+            // Two windows, and the sash.
+            if (childId == 1 || childId == 3)
+                return wxACC_NOT_IMPLEMENTED;
+            else if (childId == 2)
+            {
+                *name = wxT("Sash");
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}

 
 

-            wxString strRole(buf);
+// Can return either a child object, or an integer
+// representing the child element, starting from 1.
+wxAccStatus SplitterWindowAccessible::HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            wxPoint clientPt = splitter->ScreenToClient(pt);
+            if (splitter->SashHitTest(clientPt.x, clientPt.y, 1))
+            {
+                // We're over the sash
+                *childId = 2;
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}

 
 

-            wxString str;
-            str.Printf(wxT("Role: %s"), strRole.c_str());
-            str.Pad(indent+4, wxT(' '), FALSE);
-            Log(str);
+// Returns the rectangle for this object (id = 0) or a child element (id > 0).
+wxAccStatus SplitterWindowAccessible::GetLocation(wxRect& rect, int elementId)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && elementId == 2 && splitter->IsSplit())
+    {
+        wxSize clientSize = splitter->GetClientSize();
+        if (splitter->GetSplitMode() == wxSPLIT_VERTICAL)
+        {
+            rect.x = splitter->GetSashPosition();
+            rect.y = 0;
+            rect.SetPosition(splitter->ClientToScreen(rect.GetPosition()));
+            rect.width = splitter->GetSashSize();
+            rect.height = clientSize.y;

         }
         else
         {
         }
         else
         {

-            wxString str;
-            str.Printf(wxT("NO ROLE"));
-            str.Pad(indent+4, wxT(' '), FALSE);
-            Log(str);
+            rect.x = 0;
+            rect.y = splitter->GetSashPosition();
+            rect.SetPosition(splitter->ClientToScreen(rect.GetPosition()));
+            rect.width = clientSize.x;
+            rect.height = splitter->GetSashSize();

         }
         }

+        return wxACC_OK;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}

 
 

-        if (S_OK == obj->get_accChild(var, & pDisp) && pDisp)
+// Navigates from fromId to toId/toObject.
+wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
+                int* toId, wxAccessible** toObject)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit())
+    {
+        switch (navDir)

         {
         {

-            wxString str;
-            str.Printf(wxT("This is a real object."));
-            str.Pad(indent+4, wxT(' '), FALSE);
-            Log(str);
+        case wxNAVDIR_DOWN:
+            {
+                if (splitter->GetSplitMode() == wxSPLIT_VERTICAL)
+                {
+                    // Can't go down spatially if split vertically.
+                    return wxACC_FALSE;           
+                }
+                else
+                {
+                    if (fromId == 1)
+                    {
+                        *toId = 2;
+                        *toObject = NULL;
+                        return wxACC_OK;
+                    }
+                    else if (fromId == 2)
+                    {
+                        *toId = 3;
+                        *toObject = splitter->GetWindow2()->GetAccessible();
+                        return wxACC_OK;
+                    }
+                    else
+                        return wxACC_FALSE;
+                }
+
+                break;
+            }
+        case wxNAVDIR_FIRSTCHILD:
+            {
+                if (fromId == 2)
+                    return wxACC_FALSE;
+            }
+            break;
+            
+        case wxNAVDIR_LASTCHILD:
+            {
+                if (fromId == 2)
+                    return wxACC_FALSE;
+            }
+            break;
+            
+        case wxNAVDIR_LEFT:
+            {
+                if (splitter->GetSplitMode() == wxSPLIT_HORIZONTAL)
+                {
+                    // Can't go left spatially if split horizontally.
+                    return wxACC_FALSE;           
+                }
+                else
+                {
+                    if (fromId == 3)
+                    {
+                        *toId = 2;
+                        *toObject = NULL;
+                        return wxACC_OK;
+                    }
+                    else if (fromId == 2)
+                    {
+                        *toId = 1;
+                        *toObject = splitter->GetWindow1()->GetAccessible();
+                        return wxACC_OK;
+                    }
+                    else
+                        return wxACC_FALSE;
+                }
+            }
+            break;
+            
+        case wxNAVDIR_NEXT:
+            {
+                if (fromId == 1)
+                {
+                    *toId = 2;
+                    *toObject = NULL;
+                    return wxACC_OK;
+                }
+                else if (fromId == 2)
+                {
+                    *toId = 3;
+                    *toObject = splitter->GetWindow2()->GetAccessible();
+                    return wxACC_OK;
+                }
+                else
+                    return wxACC_FALSE;
+            }
+            break;
+            
+        case wxNAVDIR_PREVIOUS:
+            {
+                if (fromId == 3)
+                {
+                    *toId = 2;
+                    *toObject = NULL;
+                    return wxACC_OK;
+                }
+                else if (fromId == 2)
+                {
+                    *toId = 1;
+                    *toObject = splitter->GetWindow1()->GetAccessible();
+                    return wxACC_OK;
+                }
+                else
+                    return wxACC_FALSE;
+            }
+            break;
+            
+        case wxNAVDIR_RIGHT:
+            {
+                if (splitter->GetSplitMode() == wxSPLIT_HORIZONTAL)
+                {
+                    // Can't go right spatially if split horizontally.
+                    return wxACC_FALSE;           
+                }
+                else
+                {
+                    if (fromId == 1)
+                    {
+                        *toId = 2;
+                        *toObject = NULL;
+                        return wxACC_OK;
+                    }
+                    else if (fromId == 2)
+                    {
+                        *toId = 3;
+                        *toObject = splitter->GetWindow2()->GetAccessible();
+                        return wxACC_OK;
+                    }
+                    else
+                        return wxACC_FALSE;
+                }
+            }
+            break;
+            
+        case wxNAVDIR_UP:
+            {
+                if (splitter->GetSplitMode() == wxSPLIT_VERTICAL)
+                {
+                    // Can't go up spatially if split vertically.
+                    return wxACC_FALSE;           
+                }
+                else
+                {
+                    if (fromId == 3)
+                    {
+                        *toId = 2;
+                        return wxACC_OK;
+                    }
+                    else if (fromId == 2)
+                    {
+                        *toId = 1;
+                        *toObject = splitter->GetWindow1()->GetAccessible();
+                        return wxACC_OK;
+                    }
+                    else
+                        return wxACC_FALSE;
+                }
+
+                break;
+            }
+        }
+        
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}

 
 

-            if (pDisp->QueryInterface(IID_IAccessible, (LPVOID*) & childObject) == S_OK)
+// Gets the number of children.
+wxAccStatus SplitterWindowAccessible::GetChildCount(int* childCount)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            // Two windows, and the sash.
+            *childCount = 3;
+            return wxACC_OK;
+        }
+        else
+        {
+            // No sash -- 1 or 0 windows.
+            if (splitter->GetWindow1() || splitter->GetWindow2())

             {
             {

-                LogObject(indent + 4, childObject);
-                childObject->Release();
+                *childCount = 1;
+                return wxACC_OK;

             }
             }

-            pDisp->Release();
+            else
+            {
+                *childCount = 0;
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the specified child (starting from 1).
+// If *child is NULL and return value is wxACC_OK,
+// this means that the child is a simple element and
+// not an accessible object.
+wxAccStatus SplitterWindowAccessible::GetChild(int childId, wxAccessible** child)
+{
+    if (childId == wxACC_SELF)
+    {
+        *child = this;
+        return wxACC_OK;
+    }
+
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            // Two windows, and the sash.
+            if (childId == 1)
+            {
+                *child = splitter->GetWindow1()->GetAccessible();
+            }
+            else if (childId == 2)
+            {
+                *child = NULL; // Sash
+            }
+            else if (childId == 3)
+            {
+                *child = splitter->GetWindow2()->GetAccessible();
+            }
+            else
+            {
+                return wxACC_FAIL;
+            }
+            return wxACC_OK;

         }
         else
         {
         }
         else
         {

-            wxString str;
-            str.Printf(wxT("This is an element."));
-            str.Pad(indent+4, wxT(' '), FALSE);
-            Log(str);
+            // No sash -- 1 or 0 windows.
+            if (childId == 1)
+            {
+                if (splitter->GetWindow1())
+                {
+                    *child = splitter->GetWindow1()->GetAccessible();
+                    return wxACC_OK;
+                }
+                else if (splitter->GetWindow2())
+                {
+                    *child = splitter->GetWindow2()->GetAccessible();
+                    return wxACC_OK;
+                }
+                else
+                {
+                    return wxACC_FAIL;
+                }
+            }
+            else
+                return wxACC_FAIL;

         }
         }

-        Log(wxT(""));

     }
     }

+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the parent, or NULL.
+wxAccStatus SplitterWindowAccessible::GetParent(wxAccessible** parent)
+{
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Performs the default action. childId is 0 (the action for this object)
+// or > 0 (the action for a child).
+// Return wxACC_NOT_SUPPORTED if there is no default action for this
+// window (e.g. an edit control).
+wxAccStatus SplitterWindowAccessible::DoDefaultAction(int childId)
+{
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the default action for this object (0) or > 0 (the action for a child).
+// Return wxACC_OK even if there is no action. actionName is the action, or the empty
+// string if there is no action.
+// The retrieved string describes the action that is performed on an object,
+// not what the object does as a result. For example, a toolbar button that prints
+// a document has a default action of "Press" rather than "Prints the current document."
+wxAccStatus SplitterWindowAccessible::GetDefaultAction(int childId, wxString* actionName)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit() && childId == 2)
+    {
+        // No default action for the splitter.
+        return wxACC_FALSE;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns the description for this object or a child.
+wxAccStatus SplitterWindowAccessible::GetDescription(int childId, wxString* description)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            if (childId == 2)
+            {
+                * description = _("The splitter window sash.");
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns help text for this object or a child, similar to tooltip text.
+wxAccStatus SplitterWindowAccessible::GetHelpText(int childId, wxString* helpText)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            if (childId == 2)
+            {
+                * helpText = _("The splitter window sash.");
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns the keyboard shortcut for this object or child.
+// Return e.g. ALT+K
+wxAccStatus SplitterWindowAccessible::GetKeyboardShortcut(int childId, wxString* shortcut)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit() && childId == 2)
+    {
+        // No keyboard shortcut for the splitter.
+        return wxACC_FALSE;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns a role constant.
+wxAccStatus SplitterWindowAccessible::GetRole(int childId, wxAccRole* role)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter)
+    {
+        if (splitter->IsSplit())
+        {
+            if (childId == 2)
+            {
+                * role = wxROLE_SYSTEM_GRIP;
+                return wxACC_OK;
+            }
+        }
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns a state constant.
+wxAccStatus SplitterWindowAccessible::GetState(int childId, long* state)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit() && childId == 2)
+    {
+        // No particular state. Not sure what would be appropriate here.
+        *state = wxACC_STATE_SYSTEM_UNAVAILABLE;
+        return wxACC_OK;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns a localized string representing the value for the object
+// or child.
+wxAccStatus SplitterWindowAccessible::GetValue(int childId, wxString* strValue)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit() && childId == 2)
+    {
+        // The sash position is the value.
+        wxString pos;
+        pos << splitter->GetSashPosition();
+        *strValue = pos;

 
 

+        return wxACC_OK;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Selects the object or child.
+wxAccStatus SplitterWindowAccessible::Select(int childId, wxAccSelectionFlags selectFlags)
+{
+    wxSplitterWindow* splitter = wxDynamicCast(GetWindow(), wxSplitterWindow);
+    if (splitter && splitter->IsSplit() && childId == 2)
+    {
+        // Can't select the sash.
+        return wxACC_FALSE;
+    }
+    // Let the framework handle the other cases.
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the window with the keyboard focus.
+// If childId is 0 and child is NULL, no object in
+// this subhierarchy has the focus.
+// If this object has the focus, child should be 'this'.
+wxAccStatus SplitterWindowAccessible::GetFocus(int* childId, wxAccessible** child)
+{
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets a variant representing the selected children
+// of this object.
+// Acceptable values:
+// - a null variant (IsNull() returns TRUE)
+// - a list variant (GetType() == wxT("list"))
+// - an integer representing the selected child element,
+//   or 0 if this object is selected (GetType() == wxT("long"))
+// - a "void*" pointer to a wxAccessible child object
+wxAccStatus SplitterWindowAccessible::GetSelections(wxVariant* selections)
+{
+    return wxACC_NOT_IMPLEMENTED;

 }
 
 }