From 84969af72daf3d5ffab6888dbb3c64ac868df390 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 4 May 2003 14:11:45 +0000 Subject: [PATCH] Added some missing copyright lines git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_chckl.cpp | 1 + contrib/src/xrc/xh_menu.cpp | 4 +- samples/access/accesstest.cpp | 112 ++++++++++++++++++++++++++++++++++ src/gtk/gsockgtk.c | 1 + src/gtk1/gsockgtk.c | 1 + src/mac/carbon/toolbar.cpp | 3 +- src/mac/carbon/uma.cpp | 11 ++++ src/mac/toolbar.cpp | 3 +- src/mac/uma.cpp | 11 ++++ src/motif/gsockmot.c | 1 + src/msw/gsocket.c | 1 + src/os2/gsocket.c | 1 + src/os2/gsockpm.c | 1 + src/unix/gsocket.c | 1 + src/x11/gsockx11.c | 1 + src/x11/nanox.c | 1 + src/x11/pango_x.cpp | 1 + src/x11/pangox11.cpp | 1 + src/xrc/xh_chckl.cpp | 1 + src/xrc/xh_menu.cpp | 4 +- 20 files changed, 155 insertions(+), 6 deletions(-) diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp index e68540722d..18e1d02828 100644 --- a/contrib/src/xrc/xh_chckl.cpp +++ b/contrib/src/xrc/xh_chckl.cpp @@ -108,3 +108,4 @@ bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) } #endif + diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp index 80a992acfa..8c1e79c962 100644 --- a/contrib/src/xrc/xh_menu.cpp +++ b/contrib/src/xrc/xh_menu.cpp @@ -86,8 +86,8 @@ wxObject *wxMenuXmlHandler::DoCreateResource() GetText(wxT("help")), kind); #if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN) - if (HasParam(wxT("bitmap"))) - mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); + if (HasParam(wxT("bitmap"))) + mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); #endif p_menu->Append(mitem); mitem->Enable(GetBool(wxT("enabled"), TRUE)); diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp index 4fcfa8cf7a..285edb016c 100644 --- a/samples/access/accesstest.cpp +++ b/samples/access/accesstest.cpp @@ -204,6 +204,118 @@ 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) + { + if (childId == wxACC_SELF) + { + * name = wxT("Splitter window"); + return wxACC_OK; + } + else + return wxACC_NOT_IMPLEMENTED; + } + + // 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) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns the rectangle for this object (id = 0) or a child element (id > 0). + virtual wxAccStatus GetLocation(wxRect& WXUNUSED(rect), int WXUNUSED(elementId)) + { return wxACC_NOT_IMPLEMENTED; } + + // Navigates from fromId to toId/toObject. + virtual wxAccStatus Navigate(wxNavDir WXUNUSED(navDir), int WXUNUSED(fromId), + int* WXUNUSED(toId), wxAccessible** WXUNUSED(toObject)) + { return wxACC_NOT_IMPLEMENTED; } + + // Gets the number of children. + virtual wxAccStatus GetChildCount(int* WXUNUSED(childId)) + { 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. + virtual wxAccStatus GetChild(int WXUNUSED(childId), wxAccessible** WXUNUSED(child)) + { return wxACC_NOT_IMPLEMENTED; } + + // Gets the parent, or NULL. + virtual wxAccStatus GetParent(wxAccessible** WXUNUSED(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). + virtual wxAccStatus DoDefaultAction(int WXUNUSED(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." + virtual wxAccStatus GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns the description for this object or a child. + virtual wxAccStatus GetDescription(int WXUNUSED(childId), wxString* WXUNUSED(description)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns help text for this object or a child, similar to tooltip text. + virtual wxAccStatus GetHelpText(int WXUNUSED(childId), wxString* WXUNUSED(helpText)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns the keyboard shortcut for this object or child. + // Return e.g. ALT+K + virtual wxAccStatus GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns a role constant. + virtual wxAccStatus GetRole(int WXUNUSED(childId), wxAccRole* WXUNUSED(role)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns a state constant. + virtual wxAccStatus GetState(int WXUNUSED(childId), long* WXUNUSED(state)) + { return wxACC_NOT_IMPLEMENTED; } + + // Returns a localized string representing the value for the object + // or child. + virtual wxAccStatus GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue)) + { return wxACC_NOT_IMPLEMENTED; } + + // Selects the object or child. + virtual wxAccStatus Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags)) + { 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'. + virtual wxAccStatus GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(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 + virtual wxAccStatus GetSelections(wxVariant* WXUNUSED(selections)) + { return wxACC_NOT_IMPLEMENTED; } + +}; + // ---------------------------------------------------------------------------- // main frame // ---------------------------------------------------------------------------- diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c index fc88b47ddb..6a1a3f5ee7 100644 --- a/src/gtk/gsockgtk.c +++ b/src/gtk/gsockgtk.c @@ -2,6 +2,7 @@ * Project: GSocket (Generic Socket) for WX * Name: gsockgtk.c * Purpose: GSocket: GTK part + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c index fc88b47ddb..6a1a3f5ee7 100644 --- a/src/gtk1/gsockgtk.c +++ b/src/gtk1/gsockgtk.c @@ -2,6 +2,7 @@ * Project: GSocket (Generic Socket) for WX * Name: gsockgtk.c * Purpose: GSocket: GTK part + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 62b486d43d..92d048a228 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -5,7 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Stefan Csomory +// Copyright: (c) Stefan Csomor +// Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 9ec67e6f54..12bed00709 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -1,3 +1,14 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: uma.cpp +// Purpose: UMA support +// Author: Stefan Csomor +// Modified by: +// Created: 04/01/98 +// RCS-ID: $Id$ +// Copyright: (c) Stefan Csomor +// Licence: The wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #include "wx/defs.h" #include "wx/dc.h" #include diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp index 62b486d43d..92d048a228 100644 --- a/src/mac/toolbar.cpp +++ b/src/mac/toolbar.cpp @@ -5,7 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Stefan Csomory +// Copyright: (c) Stefan Csomor +// Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index 9ec67e6f54..12bed00709 100644 --- a/src/mac/uma.cpp +++ b/src/mac/uma.cpp @@ -1,3 +1,14 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: uma.cpp +// Purpose: UMA support +// Author: Stefan Csomor +// Modified by: +// Created: 04/01/98 +// RCS-ID: $Id$ +// Copyright: (c) Stefan Csomor +// Licence: The wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #include "wx/defs.h" #include "wx/dc.h" #include diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c index 1297cecdee..f442a508dc 100644 --- a/src/motif/gsockmot.c +++ b/src/motif/gsockmot.c @@ -3,6 +3,7 @@ * Name: gsockmot.c * Purpose: GSocket: Motif part * CVSID: $Id$ + * Licence: The wxWindows licence * ------------------------------------------------------------------------- */ #include "wx/setup.h" diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c index 6493dbfcec..9ea70c328e 100644 --- a/src/msw/gsocket.c +++ b/src/msw/gsocket.c @@ -3,6 +3,7 @@ * Name: gsocket.c * Author: Guillermo Rodriguez Garcia * Purpose: GSocket main MSW file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c index 5438504f7a..4547bd4151 100644 --- a/src/os2/gsocket.c +++ b/src/os2/gsocket.c @@ -4,6 +4,7 @@ * Authors: Guilhem Lavaux, * Guillermo Rodriguez Garcia (maintainer) * Purpose: GSocket main Unix-style file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/os2/gsockpm.c b/src/os2/gsockpm.c index a1996b83e3..404582c508 100644 --- a/src/os2/gsockpm.c +++ b/src/os2/gsockpm.c @@ -2,6 +2,7 @@ * Project: GSocket (Generic Socket) for WX * Name: gsockpm.c * Purpose: GSocket: PM part + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 5b7c2b23a9..3c5fa00ed0 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -4,6 +4,7 @@ * Authors: Guilhem Lavaux, * Guillermo Rodriguez Garcia (maintainer) * Purpose: GSocket main Unix file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c index 6fc3464ec7..d49b6d1c07 100644 --- a/src/x11/gsockx11.c +++ b/src/x11/gsockx11.c @@ -2,6 +2,7 @@ * Project: GSocket (Generic Socket) for WX * Name: gsockmot.c * Purpose: GSocket: X11 part + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ diff --git a/src/x11/nanox.c b/src/x11/nanox.c index 0aafc49442..5da90dd64d 100644 --- a/src/x11/nanox.c +++ b/src/x11/nanox.c @@ -2,6 +2,7 @@ * nanox.c * * Replacements for some comomon Xlib functions + * Licence: The wxWindows licence */ #include "wx/setup.h" diff --git a/src/x11/pango_x.cpp b/src/x11/pango_x.cpp index e3e12e3dec..49393ad53e 100644 --- a/src/x11/pango_x.cpp +++ b/src/x11/pango_x.cpp @@ -2,6 +2,7 @@ * This file gets included from dcclient.cpp and implements * the X11 interface to Pango. * Copyright (C) Owen Taylor and Robert Roebling. + * Licence: The wxWindows licence */ /* Declaration */ diff --git a/src/x11/pangox11.cpp b/src/x11/pangox11.cpp index 17108cf60b..3f4f0cc0c0 100644 --- a/src/x11/pangox11.cpp +++ b/src/x11/pangox11.cpp @@ -2,6 +2,7 @@ * This file gets included from dcclient.cpp and implements * the X11 interface to Pango. * Copyright (C) Owen Taylor and Robert Roebling. + * Licence: The wxWindows licence */ /* Declaration */ diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index e68540722d..18e1d02828 100644 --- a/src/xrc/xh_chckl.cpp +++ b/src/xrc/xh_chckl.cpp @@ -108,3 +108,4 @@ bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node) } #endif + diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp index 80a992acfa..8c1e79c962 100644 --- a/src/xrc/xh_menu.cpp +++ b/src/xrc/xh_menu.cpp @@ -86,8 +86,8 @@ wxObject *wxMenuXmlHandler::DoCreateResource() GetText(wxT("help")), kind); #if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN) - if (HasParam(wxT("bitmap"))) - mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); + if (HasParam(wxT("bitmap"))) + mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU)); #endif p_menu->Append(mitem); mitem->Enable(GetBool(wxT("enabled"), TRUE)); -- 2.45.2