X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e6e6f8ab806b337dffeb3b52fec7eba3c845ef..33d8353fa58dbc66fc9d22fcd510ded6b26ce719:/samples/access/accesstest.cpp diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp index 3b0938b983..29e92dad79 100644 --- a/samples/access/accesstest.cpp +++ b/samples/access/accesstest.cpp @@ -59,8 +59,8 @@ // ---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -175,7 +175,7 @@ bool MyApp::OnInit() wxHelpProvider::Set(new wxSimpleHelpProvider()); // create the main application window - MyFrame *frame = new MyFrame(_T("AccessTest wxWidgets App"), + MyFrame *frame = new MyFrame(wxT("AccessTest wxWidgets App"), wxPoint(50, 50), wxSize(450, 340)); // and show it (the frames, unlike simple controls, are not shown when @@ -187,7 +187,7 @@ bool MyApp::OnInit() // application would exit immediately. return true; #else - wxMessageBox( _T("This sample has to be compiled with wxUSE_ACCESSIBILITY"), _T("Building error"), wxOK); + wxMessageBox( wxT("This sample has to be compiled with wxUSE_ACCESSIBILITY"), wxT("Building error"), wxOK); return false; #endif // wxUSE_ACCESSIBILITY } @@ -329,7 +329,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, SetAccessible(new FrameAccessible(this)); // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); #if wxUSE_MENUS // create a menu bar @@ -337,16 +337,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu; - helpMenu->Append(AccessTest_About, _T("&About..."), _T("Show about dialog")); + helpMenu->Append(AccessTest_About, wxT("&About"), wxT("Show about dialog")); - menuFile->Append(AccessTest_Query, _T("Query"), _T("Query the window hierarchy")); + menuFile->Append(AccessTest_Query, wxT("Query"), wxT("Query the window hierarchy")); menuFile->AppendSeparator(); - menuFile->Append(AccessTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + menuFile->Append(AccessTest_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(menuFile, _T("&File")); - menuBar->Append(helpMenu, _T("&Help")); + menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(helpMenu, wxT("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -355,7 +355,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, #if 0 // wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWidgets!")); + SetStatusText(wxT("Welcome to wxWidgets!")); #endif // wxUSE_STATUSBAR @@ -395,10 +395,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; - msg.Printf( _T("This is the About dialog of the AccessTest sample.\n") - _T("Welcome to %s"), wxVERSION_STRING); + msg.Printf( wxT("This is the About dialog of the AccessTest sample.\n") + wxT("Welcome to %s"), wxVERSION_STRING); - wxMessageBox(msg, _T("About AccessTest"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, wxT("About AccessTest"), wxOK | wxICON_INFORMATION, this); } void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event)) @@ -431,7 +431,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event)) accessibleFrame->Release(); return; } - + long obtained = 0; VARIANT *var = new VARIANT[childCount]; @@ -441,7 +441,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event)) VariantInit(& (var[i])); var[i].vt = VT_DISPATCH; } - + if (S_OK == AccessibleChildren(accessibleFrame, 0, childCount, var, &obtained)) { for (i = 0; i < childCount; i++) @@ -452,7 +452,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event)) 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; @@ -565,10 +565,10 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString& 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); @@ -578,23 +578,23 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString& { 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"); - } + } } /* @@ -717,14 +717,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, return wxACC_FALSE; } break; - + case wxNAVDIR_LASTCHILD: { if (fromId == 2) return wxACC_FALSE; } break; - + case wxNAVDIR_LEFT: { if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) @@ -748,7 +748,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, // below line is not executed due to earlier return break; #endif - + case wxNAVDIR_NEXT: { if (fromId == 1) @@ -769,7 +769,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, // below line is not executed due to earlier return break; #endif - + case wxNAVDIR_PREVIOUS: { if (fromId == 3) @@ -790,7 +790,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, // below line is not executed due to earlier return break; #endif - + case wxNAVDIR_RIGHT: { if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) @@ -809,13 +809,13 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, } } // Can't go right spatially if split horizontally. - return wxACC_FALSE; + return wxACC_FALSE; } #if 0 // below line is not executed due to earlier return break; #endif - + case wxNAVDIR_UP: { if (splitter->GetSplitMode() != wxSPLIT_VERTICAL) @@ -834,14 +834,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId, } // Can't go up spatially if split vertically. - return wxACC_FALSE; + return wxACC_FALSE; #if 0 // below line is not executed due to earlier return break; #endif } } - + } // Let the framework handle the other cases. return wxACC_NOT_IMPLEMENTED;