// ----------------------------------------------------------------------------
// 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
// ----------------------------------------------------------------------------
// 'Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
#if wxUSE_ACCESSIBILITY
// Note: JAWS for Windows will only speak the context-sensitive
// help if you use this help provider:
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
// created initially)
- frame->Show(TRUE);
+ frame->Show(true);
// success: wxApp::OnRun() will be called which will enter the main message
- // loop and the application will run. If we returned FALSE here, the
+ // loop and the application will run. If we returned false here, the
// application would exit immediately.
- return TRUE;
+ return true;
#else
- wxMessageBox( _T("This sample has to be compiled with wxUSE_ACCESSIBILITY"), _T("Building error"), wxOK);
- return FALSE;
+ wxMessageBox( wxT("This sample has to be compiled with wxUSE_ACCESSIBILITY"), wxT("Building error"), wxOK);
+ return false;
#endif // wxUSE_ACCESSIBILITY
}
// Gets a variant representing the selected children
// of this object.
// Acceptable values:
- // - a null variant (IsNull() returns TRUE)
+ // - 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"))
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
- : wxFrame(NULL, -1, title, pos, size, style)
+ : wxFrame(NULL, wxID_ANY, title, pos, size, style)
{
m_textCtrl = NULL;
SetAccessible(new FrameAccessible(this));
// set the frame icon
- SetIcon(wxICON(mondrian));
+ SetIcon(wxICON(sample));
#if wxUSE_MENUS
// create a menu bar
// 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);
#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
- wxSplitterWindow* splitter = new wxSplitterWindow(this, -1);
+ wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY);
splitter->SetAccessible(new SplitterWindowAccessible(splitter));
- wxListBox* listBox = new wxListBox(splitter, -1);
+ wxListBox* listBox = new wxListBox(splitter, wxID_ANY);
listBox->Append(wxT("Cabbages"));
listBox->Append(wxT("Kings"));
listBox->Append(wxT("Sealing wax"));
listBox->CreateAccessible();
listBox->SetHelpText(wxT("This is a sample wxWidgets listbox, with a number of items in it."));
- m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
+ m_textCtrl = new wxTextCtrl(splitter, wxID_ANY, wxT(""), wxDefaultPosition,
wxDefaultSize, wxTE_MULTILINE);
m_textCtrl->CreateAccessible();
m_textCtrl->SetHelpText(wxT("This is a sample wxWidgets multiline text control."));
splitter->SplitHorizontally(listBox, m_textCtrl, 150);
#if 0
- wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this, -1);
+ wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this, wxID_ANY);
scrolledWindow->SetAccessible(new ScrolledWindowAccessible(scrolledWindow));
#endif
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- // TRUE is to force the frame to close
- Close(TRUE);
+ // true is to force the frame to close
+ Close(true);
}
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))
accessibleFrame->Release();
return;
}
-
+
long obtained = 0;
VARIANT *var = new VARIANT[childCount];
VariantInit(& (var[i]));
var[i].vt = VT_DISPATCH;
}
-
+
if (S_OK == AccessibleChildren(accessibleFrame, 0, childCount, var, &obtained))
{
for (i = 0; i < childCount; i++)
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;
wxString str;
str.Printf(wxT("Name = %s; Role = %s"), name.c_str(), role.c_str());
- str.Pad(indent, wxT(' '), FALSE);
+ str.Pad(indent, wxT(' '), false);
Log(str);
}
{
wxString str;
str.Printf(wxT("There are %d children."), (int) childCount);
- str.Pad(indent, wxT(' '), FALSE);
+ str.Pad(indent, wxT(' '), false);
Log(str);
Log(wxT(""));
}
wxString str;
str.Printf(wxT("%d) Name = %s; Role = %s"), i, name.c_str(), role.c_str());
- str.Pad(indent, wxT(' '), FALSE);
+ str.Pad(indent, wxT(' '), false);
Log(str);
VARIANT var;
{
wxString str;
str.Printf(wxT("This is a real object."));
- str.Pad(indent+4, wxT(' '), FALSE);
+ str.Pad(indent+4, wxT(' '), false);
Log(str);
if (pDisp->QueryInterface(IID_IAccessible, (LPVOID*) & childObject) == S_OK)
{
wxString str;
str.Printf(wxT("This is an element."));
- str.Pad(indent+4, wxT(' '), FALSE);
+ str.Pad(indent+4, wxT(' '), false);
Log(str);
}
// Log(wxT(""));
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);
{
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");
- }
+ }
}
/*
return wxACC_FALSE;
}
break;
-
+
case wxNAVDIR_LASTCHILD:
{
if (fromId == 2)
return wxACC_FALSE;
}
break;
-
+
case wxNAVDIR_LEFT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
// below line is not executed due to earlier return
break;
#endif
-
+
case wxNAVDIR_NEXT:
{
if (fromId == 1)
// below line is not executed due to earlier return
break;
#endif
-
+
case wxNAVDIR_PREVIOUS:
{
if (fromId == 3)
// below line is not executed due to earlier return
break;
#endif
-
+
case wxNAVDIR_RIGHT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
}
}
// 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)
}
// 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;
// Gets a variant representing the selected children
// of this object.
// Acceptable values:
-// - a null variant (IsNull() returns TRUE)
+// - 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"))
projects / wxWidgets.git / blobdiff