Skip to content

Commits on Source 6

Expand all Show whitespace changes
Inline Side-by-side
CONTRIBUTING 0 → 100644
View file @ 8e2756be
# Contributing to Eclipse Platform
Thanks for your interest in this project.
## Project description
Eclipse Platform defines the set of frameworks and common services that
collectively make up infrastructure required to support the use of Eclipse as a
component model, as a Rich Client Platform (RCP) and as a comprehensive tool
integration platform. These services and frameworks include a standard workbench
user interface model and portable native widget toolkit, a project model for
managing resources, automatic resource delta management for incremental
compilers and builders, language-independent debug infrastructure, and
infrastructure for distributed multi-user versioned resource management.
* https://projects.eclipse.org/projects/eclipse.platform
## Developer resources
Information regarding source code management, builds, coding standards, and
more.
* https://projects.eclipse.org/projects/eclipse.platform/developer
The project maintains the following source code repositories
* http://git.eclipse.org/c/platform/eclipse.platform.common.git
* http://git.eclipse.org/c/platform/eclipse.platform.debug.git
* http://git.eclipse.org/c/platform/eclipse.platform.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.buildtools.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.git
* http://git.eclipse.org/c/platform/eclipse.platform.resources.git
* http://git.eclipse.org/c/platform/eclipse.platform.runtime.git
* http://git.eclipse.org/c/platform/eclipse.platform.swt.git
* http://git.eclipse.org/c/platform/eclipse.platform.swt.binaries.git
* http://git.eclipse.org/c/platform/eclipse.platform.team.git
* http://git.eclipse.org/c/platform/eclipse.platform.text.git
* http://git.eclipse.org/c/platform/eclipse.platform.ua.git
* http://git.eclipse.org/c/platform/eclipse.platform.ui.git
* http://git.eclipse.org/c/platform/eclipse.platform.ui.tools.git
This project uses Bugzilla to track ongoing development and issues.
* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=Platform
* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=Platform
Be sure to search for existing bugs before you create another one. Remember that
contributions are always welcome!
## Eclipse Contributor Agreement
Before your contribution can be accepted by the project team contributors must
electronically sign the Eclipse Contributor Agreement (ECA).
* http://www.eclipse.org/legal/ECA.php
Commits that are provided by non-committers must have a Signed-off-by field in
the footer indicating that the author is aware of the terms by which the
contribution has been provided to the project. The non-committer must
additionally have an Eclipse Foundation account and must have a signed Eclipse
Contributor Agreement (ECA) on file.
For more information, please see the Eclipse Committer Handbook:
https://www.eclipse.org/projects/handbook/#resources-commit
## Contact
Contact the project developers via the project's "dev" list.
* https://dev.eclipse.org/mailman/listinfo/platform-dev
\ No newline at end of file
LICENSE 0 → 100644
View file @ 8e2756be
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
1. DEFINITIONS
"Contribution" means:
a) in the case of the initial Contributor, the initial content
Distributed under this Agreement, and
b) in the case of each subsequent Contributor:
i) changes to the Program, and
ii) additions to the Program;
where such changes and/or additions to the Program originate from
and are Distributed by that particular Contributor. A Contribution
"originates" from a Contributor if it was added to the Program by
such Contributor itself or anyone acting on such Contributor's behalf.
Contributions do not include changes or additions to the Program that
are not Modified Works.
"Contributor" means any person or entity that Distributes the Program.
"Licensed Patents" mean patent claims licensable by a Contributor which
are necessarily infringed by the use or sale of its Contribution alone
or when combined with the Program.
"Program" means the Contributions Distributed in accordance with this
Agreement.
"Recipient" means anyone who receives the Program under this Agreement
or any Secondary License (as applicable), including Contributors.
"Derivative Works" shall mean any work, whether in Source Code or other
form, that is based on (or derived from) the Program and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship.
"Modified Works" shall mean any work in Source Code or other form that
results from an addition to, deletion from, or modification of the
contents of the Program, including, for purposes of clarity any new file
in Source Code form that contains any contents of the Program. Modified
Works shall not include works that contain only declarations,
interfaces, types, classes, structures, or files of the Program solely
in each case in order to link to, bind by name, or subclass the Program
or Modified Works thereof.
"Distribute" means the acts of a) distributing or b) making available
in any manner that enables the transfer of a copy.
"Source Code" means the form of a Program preferred for making
modifications, including but not limited to software source code,
documentation source, and configuration files.
"Secondary License" means either the GNU General Public License,
Version 2.0, or any later versions of that license, including any
exceptions or additional permissions as identified by the initial
Contributor.
2. GRANT OF RIGHTS
a) Subject to the terms of this Agreement, each Contributor hereby
grants Recipient a non-exclusive, worldwide, royalty-free copyright
license to reproduce, prepare Derivative Works of, publicly display,
publicly perform, Distribute and sublicense the Contribution of such
Contributor, if any, and such Derivative Works.
b) Subject to the terms of this Agreement, each Contributor hereby
grants Recipient a non-exclusive, worldwide, royalty-free patent
license under Licensed Patents to make, use, sell, offer to sell,
import and otherwise transfer the Contribution of such Contributor,
if any, in Source Code or other form. This patent license shall
apply to the combination of the Contribution and the Program if, at
the time the Contribution is added by the Contributor, such addition
of the Contribution causes such combination to be covered by the
Licensed Patents. The patent license shall not apply to any other
combinations which include the Contribution. No hardware per se is
licensed hereunder.
c) Recipient understands that although each Contributor grants the
licenses to its Contributions set forth herein, no assurances are
provided by any Contributor that the Program does not infringe the
patent or other intellectual property rights of any other entity.
Each Contributor disclaims any liability to Recipient for claims
brought by any other entity based on infringement of intellectual
property rights or otherwise. As a condition to exercising the
rights and licenses granted hereunder, each Recipient hereby
assumes sole responsibility to secure any other intellectual
property rights needed, if any. For example, if a third party
patent license is required to allow Recipient to Distribute the
Program, it is Recipient's responsibility to acquire that license
before distributing the Program.
d) Each Contributor represents that to its knowledge it has
sufficient copyright rights in its Contribution, if any, to grant
the copyright license set forth in this Agreement.
e) Notwithstanding the terms of any Secondary License, no
Contributor makes additional grants to any Recipient (other than
those set forth in this Agreement) as a result of such Recipient's
receipt of the Program under the terms of a Secondary License
(if permitted under the terms of Section 3).
3. REQUIREMENTS
3.1 If a Contributor Distributes the Program in any form, then:
a) the Program must also be made available as Source Code, in
accordance with section 3.2, and the Contributor must accompany
the Program with a statement that the Source Code for the Program
is available under this Agreement, and informs Recipients how to
obtain it in a reasonable manner on or through a medium customarily
used for software exchange; and
b) the Contributor may Distribute the Program under a license
different than this Agreement, provided that such license:
i) effectively disclaims on behalf of all other Contributors all
warranties and conditions, express and implied, including
warranties or conditions of title and non-infringement, and
implied warranties or conditions of merchantability and fitness
for a particular purpose;
ii) effectively excludes on behalf of all other Contributors all
liability for damages, including direct, indirect, special,
incidental and consequential damages, such as lost profits;
iii) does not attempt to limit or alter the recipients' rights
in the Source Code under section 3.2; and
iv) requires any subsequent distribution of the Program by any
party to be under a license that satisfies the requirements
of this section 3.
3.2 When the Program is Distributed as Source Code:
a) it must be made available under this Agreement, or if the
Program (i) is combined with other material in a separate file or
files made available under a Secondary License, and (ii) the initial
Contributor attached to the Source Code the notice described in
Exhibit A of this Agreement, then the Program may be made available
under the terms of such Secondary Licenses, and
b) a copy of this Agreement must be included with each copy of
the Program.
3.3 Contributors may not remove or alter any copyright, patent,
trademark, attribution notices, disclaimers of warranty, or limitations
of liability ("notices") contained within the Program from any copy of
the Program which they Distribute, provided that Contributors may add
their own appropriate notices.
4. COMMERCIAL DISTRIBUTION
Commercial distributors of software may accept certain responsibilities
with respect to end users, business partners and the like. While this
license is intended to facilitate the commercial use of the Program,
the Contributor who includes the Program in a commercial product
offering should do so in a manner which does not create potential
liability for other Contributors. Therefore, if a Contributor includes
the Program in a commercial product offering, such Contributor
("Commercial Contributor") hereby agrees to defend and indemnify every
other Contributor ("Indemnified Contributor") against any losses,
damages and costs (collectively "Losses") arising from claims, lawsuits
and other legal actions brought by a third party against the Indemnified
Contributor to the extent caused by the acts or omissions of such
Commercial Contributor in connection with its distribution of the Program
in a commercial product offering. The obligations in this section do not
apply to any claims or Losses relating to any actual or alleged
intellectual property infringement. In order to qualify, an Indemnified
Contributor must: a) promptly notify the Commercial Contributor in
writing of such claim, and b) allow the Commercial Contributor to control,
and cooperate with the Commercial Contributor in, the defense and any
related settlement negotiations. The Indemnified Contributor may
participate in any such claim at its own expense.
For example, a Contributor might include the Program in a commercial
product offering, Product X. That Contributor is then a Commercial
Contributor. If that Commercial Contributor then makes performance
claims, or offers warranties related to Product X, those performance
claims and warranties are such Commercial Contributor's responsibility
alone. Under this section, the Commercial Contributor would have to
defend claims against the other Contributors related to those performance
claims and warranties, and if a court requires any other Contributor to
pay any damages as a result, the Commercial Contributor must pay
those damages.
5. NO WARRANTY
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
PURPOSE. Each Recipient is solely responsible for determining the
appropriateness of using and distributing the Program and assumes all
risks associated with its exercise of rights under this Agreement,
including but not limited to the risks and costs of program errors,
compliance with applicable laws, damage to or loss of data, programs
or equipment, and unavailability or interruption of operations.
6. DISCLAIMER OF LIABILITY
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
7. GENERAL
If any provision of this Agreement is invalid or unenforceable under
applicable law, it shall not affect the validity or enforceability of
the remainder of the terms of this Agreement, and without further
action by the parties hereto, such provision shall be reformed to the
minimum extent necessary to make such provision valid and enforceable.
If Recipient institutes patent litigation against any entity
(including a cross-claim or counterclaim in a lawsuit) alleging that the
Program itself (excluding combinations of the Program with other software
or hardware) infringes such Recipient's patent(s), then such Recipient's
rights granted under Section 2(b) shall terminate as of the date such
litigation is filed.
All Recipient's rights under this Agreement shall terminate if it
fails to comply with any of the material terms or conditions of this
Agreement and does not cure such failure in a reasonable period of
time after becoming aware of such noncompliance. If all Recipient's
rights under this Agreement terminate, Recipient agrees to cease use
and distribution of the Program as soon as reasonably practicable.
However, Recipient's obligations under this Agreement and any licenses
granted by Recipient relating to the Program shall continue and survive.
Everyone is permitted to copy and distribute copies of this Agreement,
but in order to avoid inconsistency the Agreement is copyrighted and
may only be modified in the following manner. The Agreement Steward
reserves the right to publish new versions (including revisions) of
this Agreement from time to time. No one other than the Agreement
Steward has the right to modify this Agreement. The Eclipse Foundation
is the initial Agreement Steward. The Eclipse Foundation may assign the
responsibility to serve as the Agreement Steward to a suitable separate
entity. Each new version of the Agreement will be given a distinguishing
version number. The Program (including Contributions) may always be
Distributed subject to the version of the Agreement under which it was
received. In addition, after a new version of the Agreement is published,
Contributor may elect to Distribute the Program (including its
Contributions) under the new version.
Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
receives no rights or licenses to the intellectual property of any
Contributor under this Agreement, whether expressly, by implication,
estoppel or otherwise. All rights in the Program not expressly granted
under this Agreement are reserved. Nothing in this Agreement is intended
to be enforceable by any entity that is not a Contributor or Recipient.
No third-party beneficiary rights are created under this Agreement.
Exhibit A - Form of Secondary Licenses Notice
"This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set forth
in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
version(s), and exceptions or additional permissions here}."
Simply including a copy of this Agreement, including this Exhibit A
is not sufficient to license the Source Code under Secondary Licenses.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to
look for such a notice.
You may add additional accurate notices of copyright ownership.
\ No newline at end of file
NOTICE 0 → 100644
View file @ 8e2756be
# Notices for Eclipse Platform
This content is produced and maintained by the Eclipse Platform project.
* Project home: https://projects.eclipse.org/projects/eclipse.platform
## Trademarks
Eclipse Platform is a trademark of the Eclipse Foundation.
## Copyright
All content is the property of the respective authors or their employers. For
more information regarding authorship of content, please consult the listed
source code repository logs.
## Declared Project Licenses
This program and the accompanying materials are made available under the terms
of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
## Source Code
The project maintains the following source code repositories:
* http://git.eclipse.org/c/platform/eclipse.platform.common.git
* http://git.eclipse.org/c/platform/eclipse.platform.debug.git
* http://git.eclipse.org/c/platform/eclipse.platform.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.buildtools.git
* http://git.eclipse.org/c/platform/eclipse.platform.releng.git
* http://git.eclipse.org/c/platform/eclipse.platform.resources.git
* http://git.eclipse.org/c/platform/eclipse.platform.runtime.git
* http://git.eclipse.org/c/platform/eclipse.platform.swt.git
* http://git.eclipse.org/c/platform/eclipse.platform.swt.binaries.git
* http://git.eclipse.org/c/platform/eclipse.platform.team.git
* http://git.eclipse.org/c/platform/eclipse.platform.text.git
* http://git.eclipse.org/c/platform/eclipse.platform.ua.git
* http://git.eclipse.org/c/platform/eclipse.platform.ui.git
* http://git.eclipse.org/c/platform/eclipse.platform.ui.tools.git
\ No newline at end of file
bundles/org.eclipse.swt.tools.base/pom.xml
View file @ 8e2756be
......@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.swt.localbuild</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.9.0-SNAPSHOT</version>
<version>4.10.0-SNAPSHOT</version>
<relativePath>../../local-build/local-build-parent/</relativePath>
</parent>
<groupId>org.eclipse.swt</groupId>
......
bundles/org.eclipse.swt.tools.spies/pom.xml
View file @ 8e2756be
......@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.swt.localbuild</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.9.0-SNAPSHOT</version>
<version>4.10.0-SNAPSHOT</version>
<relativePath>../../local-build/local-build-parent/</relativePath>
</parent>
<groupId>org.eclipse.swt</groupId>
......
bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
View file @ 8e2756be
......@@ -13,12 +13,12 @@
###############################################################################
swt_copyright=/*******************************************************************************\n \
* Copyright (c) 2000, %END_YEAR IBM Corporation and others.\n \
*
*\n \
* This program and the accompanying materials\n \
* are made available under the terms of the Eclipse Public License 2.0\n \
* which accompanies this distribution, and is available at\n \
* https://www.eclipse.org/legal/epl-2.0/
*
* https://www.eclipse.org/legal/epl-2.0/\n \
*\n \
* SPDX-License-Identifier: EPL-2.0\n \
*\n \
* Contributors:\n \
......@@ -26,12 +26,12 @@ swt_copyright=/*****************************************************************
*******************************************************************************/\n
swt_properties_copyright=###############################################################################\n\
# Copyright (c) 2000, %END_YEAR IBM Corporation and others.\n\
#
#\n\
# This program and the accompanying materials\n\
# are made available under the terms of the Eclipse Public License 2.0\n\
# which accompanies this distribution, and is available at\n\
# https://www.eclipse.org/legal/epl-2.0/
#
# https://www.eclipse.org/legal/epl-2.0/\n\
#\n\
# SPDX-License-Identifier: EPL-2.0\n\
#\n\
# Contributors:\n\
......
bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
View file @ 8e2756be
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true
Bundle-Version: 3.107.100.qualifier
Bundle-Version: 3.107.200.qualifier
Bundle-Activator: org.eclipse.swt.tools.Activator
Bundle-ManifestVersion: 2
Export-Package: org.eclipse.swt.tools,
......
bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
View file @ 8e2756be
......@@ -159,18 +159,6 @@
</predicate>
</sourceLocator>
</targlet>
<targlet
name="Platform"
activeRepositoryList="${eclipse.target.platform}">
<requirement
name="org.eclipse.platform.feature.group"/>
<requirement
name="org.eclipse.jdt.feature.group"/>
<requirement
name="org.eclipse.pde.feature.group"/>
<requirement
name="org.eclipse.equinox.executable.feature.group"/>
</targlet>
</setupTask>
<setupTask
xsi:type="setup.workingsets:WorkingSetTask">
......
bundles/org.eclipse.swt.tools/gtk/dynamic_gtk2_vs_gtk3.py deleted 100755 → 0
View file @ c05f3473
#!/usr/bin/python3
#*******************************************************************************
# Copyright (c) 2016 The Eclipse Foundation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Rolf Theunissen - initial version, adapted from dynamic_deprecated.py
#*******************************************************************************
import sys
import re
from urllib.request import urlopen
from html.parser import HTMLParser
API_GTK2_STABLE_URL = "https://developer.gnome.org/gtk2/stable/api-index-full.html"
API_GTK3_0_URL = "https://developer.gnome.org/gtk3/3.0/api-index-full.html"
API_GTK3_STABLE_URL = "https://developer.gnome.org/gtk3/stable/api-index-full.html"
API_GTK3_DEPRECATED_URL = "https://developer.gnome.org/gtk3/stable/api-index-deprecated.html"
OS_FILE = "./../../org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
FUNCTION_LIST = []
GTK2_FUNCTION_LIST = []
GTK30_FUNCTION_LIST = []
GTK3x_FUNCTION_LIST = []
GTK3x_DEPR_FUNCTION_LIST = []
GTK2_GTK30_SHARED_FUNCTION_LIST = []
GTK2_GTK3x_SHARED_FUNCTION_LIST = []
# This script is Python 3 only.
#
# USAGE OPTIONS:
# <no option specified>: prints list of deprecated dynamic functions to console.
# -f: writes the list of deprecated dynamic functions to a file called dynamic_deprecated_functions.txt.
# The file is in the same directory as the script
def download_symbols(api_url):
# Fetch symbols from api_url
with urlopen(api_url) as url:
dep_file = url.read()
return str(dep_file);
def download_gtk2_stable_symbols():
return download_symbols(API_GTK2_STABLE_URL);
def download_gtk3_0_symbols():
return download_symbols(API_GTK3_0_URL);
def download_gtk3_stable_symbols():
return download_symbols(API_GTK3_STABLE_URL);
def download_gtk3_deprecated_symbols():
return download_symbols(API_GTK3_DEPRECATED_URL);
def populate_function_list():
# Read os_custom.h from file
with open(OS_FILE) as f:
os_custom = f.read()
return str(os_custom);
def find_gtk_version_functions(custom_str, gtk2_str, gtk30_str, gtk3x_str, gtk3x_dpr_str):
regex = r"((GTK|GDK)_LOAD_FUNCTION\(fp, (\w+))+"
matchList = re.findall(regex, custom_str)
# Search through list of regex matches, strip the "_LIB" and populate
# the dynamic function list.
for match in matchList:
function_name = match[2]
FUNCTION_LIST.append(function_name)
# Check each dynamic function and see if it's deprecated: if so, populate
# the deprecated function list.
for func in FUNCTION_LIST:
func_tag = ">" + func + "<"
if func_tag in gtk2_str:
GTK2_FUNCTION_LIST.append(func)
if func_tag in gtk30_str:
GTK30_FUNCTION_LIST.append(func)
if func_tag in gtk3x_str:
GTK3x_FUNCTION_LIST.append(func)
if func_tag in gtk3x_dpr_str:
GTK3x_DEPR_FUNCTION_LIST.append(func)
return;
def find_gtk2_and_gtk3_shared():
for func in GTK2_FUNCTION_LIST:
if func in GTK30_FUNCTION_LIST:
GTK2_GTK30_SHARED_FUNCTION_LIST.append(func)
elif func in GTK30_FUNCTION_LIST:
GTK2_GTK3x_SHARED_FUNCTION_LIST.append(func)
if __name__ == "__main__":
gtk2functions = download_gtk2_stable_symbols()
gtk30functions = download_gtk3_0_symbols()
gtk3xfunctions = download_gtk3_stable_symbols()
gtk3xdeprecated = download_gtk3_deprecated_symbols()
os_custom_str = populate_function_list()
find_gtk_version_functions(os_custom_str, gtk2functions, gtk30functions,
gtk3xfunctions, gtk3xdeprecated)
find_gtk2_and_gtk3_shared()
# If the user specified the "-f" option, the output will be written to
# a file named "dynamic_deprecated_functions.txt"
if len(sys.argv) == 2 and "-f" in str(sys.argv):
with open("dynamic_gtk2x_gtk30_shared_functions.txt","w") as f:
for i in GTK2_GTK30_SHARED_FUNCTION_LIST:
if i in GTK3x_DEPR_FUNCTION_LIST:
f.write ("#")
f.write(i + "\n")
f.close()
with open("dynamic_gtk2x_gtk3x_shared_functions.txt","w") as f:
for i in GTK2_GTK3x_SHARED_FUNCTION_LIST:
if i in GTK3x_DEPR_FUNCTION_LIST:
f.write ("#")
f.write(i + "\n")
f.close()
# If no options are specified, print the list to console
else:
print ("# GTK2.x - GTK3.0 SHARED")
for i in GTK2_GTK30_SHARED_FUNCTION_LIST:
if i in GTK3x_DEPR_FUNCTION_LIST:
print("#" + i)
else:
print(i)
print()
print ("# GTK2.x - GTK3.x SHARED")
for i in GTK2_GTK3x_SHARED_FUNCTION_LIST:
if i in GTK3x_DEPR_FUNCTION_LIST:
print("#" + i)
else:
print(i)
sys.exit(0)
bundles/org.eclipse.swt.tools/gtk/install_sysdeps.sh
View file @ 8e2756be
......@@ -39,12 +39,12 @@ func_configure_fedora () {
func_echo_plus "Installing Java 8 development packages that include jni.h for JNI bindings. Update this script to '9' when java 9 comes out"
sudo $INSTALL_CMD -y install java-1.8.0-openjdk-devel.x86_64
func_echo_plus "Installing Gtk2 and Gtk3 development packages"
sudo $INSTALL_CMD -y install gtk3-devel gtk2-devel
func_echo_plus "Installing Gtk3 development packages"
sudo $INSTALL_CMD -y install gtk3-devel
func_echo_plus "Installing X11 Development libraries. Someday when wayland takes over these will not be needed..."
# Deals with error: "#include <X11/Intrinsic.h>, #include <X11/extensions/XTest.h>" build errors)
sudo $INSTALL_CMD -y install libXt-devel libXtst-devel
sudo $INSTALL_CMD -y install libXt-devel
func_echo_plus "Install Mesa (OpenGL headers)"
# Deals with error: "/usr/bin/ld: cannot find -lGLU collect2: error: ld returned 1 exit status"
......@@ -66,8 +66,8 @@ Consider updating this script for your distribution.
In general, You should install the following packages:
- C Development tools (usually comes in a 'group install')
- java-*-openjdk-devel (depending on current version of java)
- gtk2-devel gtk3-devel
- libXt-devel libXts-devel
- gtk3-devel
- libXt-devel
- mesa-libGLU-devel
"
......
bundles/org.eclipse.swt.tools/pom.xml
View file @ 8e2756be
......@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.swt.localbuild</artifactId>
<groupId>eclipse.platform.swt</groupId>
<version>4.9.0-SNAPSHOT</version>
<version>4.10.0-SNAPSHOT</version>
<relativePath>../../local-build/local-build-parent/</relativePath>
</parent>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.tools</artifactId>
<version>3.107.100-SNAPSHOT</version>
<version>3.107.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
bundles/org.eclipse.swt/.settings/org.eclipse.pde.api.tools.prefs
View file @ 8e2756be
ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
......@@ -10,6 +11,7 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
API_USE_SCAN_FIELD_SEVERITY=Error
API_USE_SCAN_METHOD_SEVERITY=Error
API_USE_SCAN_TYPE_SEVERITY=Error
CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
......@@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Error
ILLEGAL_INSTANTIATE=Error
ILLEGAL_OVERRIDE=Error
ILLEGAL_REFERENCE=Error
INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error
INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
......@@ -78,18 +81,22 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
MISSING_EE_DESCRIPTIONS=Warning
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
UNUSED_PROBLEM_FILTERS=Ignore
automatically_removed_unused_problem_filters=false
UNUSED_PROBLEM_FILTERS=Warning
automatically_removed_unused_problem_filters=Enabled
changed_execution_env=Error
eclipse.preferences.version=1
incompatible_api_component_version=Error
incompatible_api_component_version_include_major_without_breaking_change=Disabled
incompatible_api_component_version_include_minor_without_api_change=Disabled
incompatible_api_component_version_report_major_without_breaking_change=Warning
incompatible_api_component_version_report_minor_without_api_change=Warning
invalid_since_tag_version=Error
malformed_since_tag=Error
missing_since_tag=Error
......
bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
View file @ 8e2756be
......@@ -89,13 +89,9 @@ static synchronized void initializeSwing() {
* that make SWT exit. The fix is to hide all X
* errors when AWT is running.
*/
if (GTK.GTK3) {
if (OS.isX11()) {
GDK.gdk_x11_display_error_trap_push(GDK.gdk_display_get_default());
}
} else {
GDK.gdk_error_trap_push();
}
try {
/* Initialize the default focus traversal policy */
Class<?> clazz = Class.forName("javax.swing.UIManager");
......@@ -192,12 +188,7 @@ public static Frame new_Frame (final Composite parent) {
Shell shell = parent.getShell();
long /*int*/ awtHandle = getAWTHandle(window);
if (awtHandle == 0) return;
long /*int*/ xWindow;
if (GTK.GTK3) {
xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (shell.handle));
} else {
xWindow = GDK.gdk_x11_drawable_get_xid(GTK.gtk_widget_get_window(GTK.gtk_widget_get_toplevel(shell.handle)));
}
long /*int*/ xWindow = GDK.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (shell.handle));
OS.XSetTransientForHint(GDK.gdk_x11_display_get_xdisplay(GDK.gdk_display_get_default()), awtHandle, xWindow);
});
}
......
bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
View file @ 8e2756be
......@@ -117,13 +117,9 @@ public class Accessible {
Accessible (Control control) {
super ();
this.control = control;
if (GTK.GTK3) {
long /*int*/ type = OS.G_OBJECT_TYPE (getControlHandle());
accessibleObject = new AccessibleObject (type, getControlHandle(), this, false);
addRelations();
} else {
AccessibleFactory.registerAccessible (this);
}
}
/**
......@@ -483,7 +479,6 @@ public class Accessible {
AccessibleObject getAccessibleObject () {
if (accessibleObject == null) {
if (GTK.GTK3) {
long /*int*/ widget = this.getControlHandle();
long /*int*/ type = OS.G_OBJECT_TYPE (widget);
if (parent == null) {
......@@ -492,15 +487,6 @@ public class Accessible {
accessibleObject = new AccessibleObject (type, 0, this, true);
accessibleObject.parent = parent.getAccessibleObject();
}
} else {
if (parent == null) {
AccessibleFactory.createAccessible(this);
} else {
accessibleObject = AccessibleFactory.createChildAccessible(this, ACC.CHILDID_SELF);
accessibleObject.parent = parent.getAccessibleObject();
}
}
}
return accessibleObject;
}
......@@ -538,7 +524,6 @@ public class Accessible {
* @noreference This method is not intended to be referenced by clients.
*/
public void internal_dispose_Accessible() {
if (!GTK.GTK3) AccessibleFactory.unregisterAccessible (Accessible.this);
release ();
}
......
bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
View file @ 8e2756be
......@@ -42,21 +42,8 @@ class AccessibleObject {
static final Map<LONG, AccessibleObject> AccessibleObjects = new HashMap<> (9);
static final boolean DEBUG = Device.DEBUG;
static final int ROW_ROLE;
static {
// Gtk3.2 has a minimum requirement of ATK 2.1.5
// ATK_ROLE_TABLE_ROW was introduced in ATK 2.1.0. See Bug 470629 for details.
if (GTK.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
ROW_ROLE = ATK.ATK_ROLE_TABLE_ROW;
} else {
ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs("row", true)); //$NON-NLS-1$
}
}
AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) {
super ();
if (GTK.GTK3) {
if (type == OS.swt_fixed_get_type()) {
if (widget != 0 && !isLightweight) {
atkHandle = GTK.gtk_widget_get_accessible(widget);
......@@ -71,10 +58,6 @@ class AccessibleObject {
// been implemented for native GTK widgets on GTK3.
atkHandle = GTK.gtk_widget_get_accessible(widget);
}
} else {
atkHandle = OS.g_object_new (type, 0);
ATK.atk_object_initialize (atkHandle, widget);
}
this.accessible = accessible;
this.isLightweight = isLightweight;
AccessibleObjects.put (new LONG (atkHandle), this);
......@@ -99,7 +82,7 @@ class AccessibleObject {
* parent
*/
static AtkActionIface getParentActionIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_ACTION())) {
AtkActionIface iface = new AtkActionIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject)));
......@@ -346,7 +329,7 @@ class AccessibleObject {
* parent
*/
static AtkComponentIface getParentComponentIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_COMPONENT())) {
AtkComponentIface iface = new AtkComponentIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject)));
......@@ -505,12 +488,8 @@ class AccessibleObject {
AtkComponentIface iface = getParentComponentIface (atkObject);
if (iface != null && iface.get_size != 0) {
// ATK with GTK3 doesn't have the coord_type parameter
if (!GTK.GTK3) {
OS.call (iface.get_size, atkObject, width, height, coord_type);
} else {
ATK.call (iface.get_size, atkObject, width, height);
}
}
if (object != null) {
Accessible accessible = object.accessible;
List<AccessibleControlListener> listeners = accessible.accessibleControlListeners;
......@@ -599,7 +578,7 @@ class AccessibleObject {
* parent
*/
static AtkEditableTextIface getParentEditableTextIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_EDITABLE_TEXT())) {
AtkEditableTextIface iface = new AtkEditableTextIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject)));
......@@ -1039,7 +1018,7 @@ class AccessibleObject {
* parent
*/
static AtkHypertextIface getParentHypertextIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_HYPERTEXT())) {
AtkHypertextIface iface = new AtkHypertextIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject)));
......@@ -1172,9 +1151,9 @@ class AccessibleObject {
* @return an AtkObjectClass object representing the class struct of atkObject's
* parent
*/
static AtkObjectClass getParentAtkObjectClass (long /*int*/ atkObject) {
static AtkObjectClass getParentAtkObjectClass () {
AtkObjectClass objectClass = new AtkObjectClass ();
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (type != 0) {
long /*int*/ parentType = OS.g_type_parent (type);
if (parentType != 0) ATK.memmove (objectClass, OS.g_type_class_peek (parentType));
......@@ -1198,7 +1177,7 @@ class AccessibleObject {
static long /*int*/ atkObject_get_description (long /*int*/ atkObject) {
AccessibleObject object = getAccessibleObject (atkObject);
long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_description != 0) {
parentResult = ATK.call (objectClass.get_description, atkObject);
}
......@@ -1239,7 +1218,7 @@ class AccessibleObject {
static long /*int*/ atkObject_get_attributes (long /*int*/ atkObject) {
AccessibleObject object = getAccessibleObject (atkObject);
long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_attributes != 0) {
parentResult = ATK.call (objectClass.get_attributes, atkObject);
}
......@@ -1385,7 +1364,7 @@ class AccessibleObject {
static long /*int*/ atkObject_get_name (long /*int*/ atkObject) {
AccessibleObject object = getAccessibleObject (atkObject);
long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_name != 0) {
parentResult = ATK.call (objectClass.get_name, atkObject);
}
......@@ -1426,7 +1405,7 @@ class AccessibleObject {
static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) {
AccessibleObject object = getAccessibleObject (atkObject);
long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_n_children != 0) {
parentResult = ATK.call (objectClass.get_n_children, atkObject);
}
......@@ -1481,7 +1460,7 @@ class AccessibleObject {
return object.index;
}
}
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_index_in_parent == 0) return 0;
long /*int*/ result = ATK.call (objectClass.get_index_in_parent, atkObject);
return result;
......@@ -1508,7 +1487,7 @@ class AccessibleObject {
return object.parent.atkHandle;
}
}
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_parent == 0) return 0;
long /*int*/ parentResult = ATK.call (objectClass.get_parent, atkObject);
return parentResult;
......@@ -1573,7 +1552,7 @@ class AccessibleObject {
case ACC.ROLE_RADIOBUTTON: return ATK.ATK_ROLE_RADIO_BUTTON;
case ACC.ROLE_SPLITBUTTON: return ATK.ATK_ROLE_PUSH_BUTTON;
case ACC.ROLE_WINDOW: return ATK.ATK_ROLE_WINDOW;
case ACC.ROLE_ROW: return ROW_ROLE;
case ACC.ROLE_ROW: return ATK.ATK_ROLE_TABLE_ROW;
case ACC.ROLE_COLUMN: return ATK.ATK_ROLE_UNKNOWN; //Column role doesn't exist on Gtk.
case ACC.ROLE_ALERT: return ATK.ATK_ROLE_ALERT;
case ACC.ROLE_ANIMATION: return ATK.ATK_ROLE_ANIMATION;
......@@ -1599,7 +1578,7 @@ class AccessibleObject {
}
}
}
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.get_role == 0) return 0;
return ATK.call (objectClass.get_role, atkObject);
}
......@@ -1644,7 +1623,7 @@ class AccessibleObject {
return OS.g_object_ref (accObject.atkHandle);
}
}
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.ref_child == 0) return 0;
return ATK.call (objectClass.ref_child, atkObject, index);
}
......@@ -1665,7 +1644,7 @@ class AccessibleObject {
static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) {
AccessibleObject object = getAccessibleObject (atkObject);
long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getParentAtkObjectClass (atkObject);
AtkObjectClass objectClass = getParentAtkObjectClass ();
if (objectClass.ref_state_set != 0) {
parentResult = ATK.call (objectClass.ref_state_set, atkObject);
}
......@@ -1725,7 +1704,7 @@ class AccessibleObject {
* parent
*/
static AtkSelectionIface getParentSelectionIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type() ;
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_SELECTION())) {
AtkSelectionIface iface = new AtkSelectionIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject)));
......@@ -1830,7 +1809,7 @@ class AccessibleObject {
* parent
*/
static AtkTableIface getParentTableIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TABLE())) {
AtkTableIface iface = new AtkTableIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject)));
......@@ -2801,7 +2780,7 @@ class AccessibleObject {
* parent
*/
static AtkTextIface getParentTextIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TEXT())) {
AtkTextIface iface = new AtkTextIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject)));
......@@ -3044,11 +3023,7 @@ class AccessibleObject {
if (color != null && !color.isDisposed()) {
long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
if (GTK.GTK3) {
attr.value = getStringPtr ((color.handleRGBA.red * 255) + "," + (color.handleRGBA.green * 255) + "," + (color.handleRGBA.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
} else {
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
}
attr.value = getStringPtr ((color.handle.red * 255) + "," + (color.handle.green * 255) + "," + (color.handle.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
result = OS.g_slist_append(result, attrPtr);
}
......@@ -3056,11 +3031,7 @@ class AccessibleObject {
if (color != null && !color.isDisposed()) {
long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
if (GTK.GTK3) {
attr.value = getStringPtr ((color.handleRGBA.red * 255) + "," + (color.handleRGBA.green * 255) + "," + (color.handleRGBA.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
} else {
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
}
attr.value = getStringPtr ((color.handle.red * 255) + "," + (color.handle.green * 255) + "," + (color.handle.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
result = OS.g_slist_append(result, attrPtr);
}
......@@ -4396,7 +4367,7 @@ class AccessibleObject {
* parent
*/
static AtkValueIface getParentValueIface (long /*int*/ atkObject) {
long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
long /*int*/ type = OS.swt_fixed_accessible_get_type();
if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_VALUE())) {
AtkValueIface iface = new AtkValueIface ();
ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject)));
......@@ -4617,16 +4588,8 @@ class AccessibleObject {
static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) {
/*
* GObject destruction is handled in os_custom.c in GTK3.
* Both GTK3 and GTK2 need to remove the AccessibleObject from
* the map of AccessibleObjects, though.
* AccessibleObject has to be removed from the map of AccessibleObjects, though.
*/
if (!GTK.GTK3) {
long /*int*/ superType = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (atkObject));
long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (superType);
GObjectClass objectClassStruct = new GObjectClass ();
OS.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
}
AccessibleObject object = AccessibleObjects.get (new LONG (atkObject));
if (object != null) {
AccessibleObjects.remove (new LONG (atkObject));
......@@ -4873,10 +4836,8 @@ class AccessibleObject {
OS.g_object_notify(atkHandle, ATK.accessible_hypertext_nlinks);
break;
case ACC.EVENT_ATTRIBUTE_CHANGED:
if (GTK.GTK3) {
long /*int*/ gType = OS.G_OBJECT_TYPE(atkHandle);
if (gType == GTK.GTK_TYPE_TEXT_VIEW_ACCESSIBLE()) break;
}
OS.g_signal_emit_by_name (atkHandle, ATK.attributes_changed);
break;
case ACC.EVENT_TABLE_CAPTION_CHANGED:
......@@ -5029,13 +4990,9 @@ class AccessibleObject {
object = event.accessible.getAccessibleObject();
if (object != null) OS.g_object_ref(object.atkHandle);
} else {
if (GTK.GTK3) {
long /*int*/ type = OS.G_OBJECT_TYPE (accessible.getControlHandle());
long /*int*/ widget = accessible.getControlHandle();
object = new AccessibleObject(type, widget, accessible, true);
} else {
object = AccessibleFactory.createChildAccessible (accessible, id);
}
}
object.id = id;
} else {
......
bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
View file @ 8e2756be
......@@ -2521,6 +2521,10 @@ public class Accessible {
if (widget != null && widget instanceof TreeItem) {
TreeItem item = (TreeItem) widget;
for (int i = 1; i < columnCount; i++) {
if (tree.isDisposed() || item.isDisposed()) {
event.result = "";
return COM.S_OK;
}
event.result += tree.getColumn(i).getText() + ": " + item.getText(i);
if (i + 1 < columnCount) event.result += ", ";
}
......
bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
View file @ 8e2756be
......@@ -107,13 +107,7 @@ public Browser (Composite parent, int style) {
String errMsg = " because no underlying browser available.\n";
switch (SWT.getPlatform()) {
case "gtk":
String gtkVersion = System.getProperty("org.eclipse.swt.internal.gtk.version");
boolean isGtk2 = Integer.parseInt(gtkVersion.substring(0,1)) == 2 ? true : false;
if (isGtk2) {
errMsg = errMsg + " SWT on GTK 2.x detected. It is reccomended to use SWT on GTK 3.x and Webkit2 API.\n";
} else { // Gtk3 & above.
errMsg = errMsg + " Please ensure Webkit with its Gtk 3.x bindings installed. Webkit2 API level preferred.\n";
}
break;
case "cocoa":
errMsg = errMsg + " SWT failed to load webkit library.\n";
......