diff options
author | Dan Albert <danalbert@google.com> | 2016-02-24 13:48:45 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2016-02-24 13:51:18 -0800 |
commit | b9de1157289455b0ca26daff519d4a0ddcd1fa13 (patch) | |
tree | 4c56cc0a34b91f17033a40a455f26652304f7b8d /gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp | |
parent | 098157a754787181cfa10e71325832448ddcea98 (diff) | |
download | toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.tar.gz toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.tar.bz2 toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.zip |
Update 4.8.1 to 4.8.3.
My previous drop was the wrong version. The platform mingw is
currently using 4.8.3, not 4.8.1 (not sure how I got that wrong).
From ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2.
Bug: http://b/26523949
Change-Id: Id85f1bdcbbaf78c7d0b5a69e74c798a08f341c35
Diffstat (limited to 'gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp')
-rw-r--r-- | gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp b/gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp deleted file mode 100644 index c924bcc91..000000000 --- a/gcc-4.8.1/libjava/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* qtmenucomponentpeer.cpp -- - Copyright (C) 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -#include <assert.h> -#include <QWidget> -#include <gnu_java_awt_peer_qt_QtMenuComponentPeer.h> -#include "nativewrapper.h" -#include "componentevent.h" - - -/** - * Calls back init() from the main thread. - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtMenuComponentPeer_callInit -(JNIEnv *env, jobject obj) -{ - mainThread->postEventToMain( new AWTInitEvent( env, obj ) ); - // wait for the thing to be created. -} - -/* - * Generic disposal. - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtMenuComponentPeer_dispose -(JNIEnv *env, jobject obj) -{ - QWidget *widget = (QWidget *) getNativeObject( env, obj ); - assert( widget ); - - setNativeObject(env, obj, NULL); - mainThread->postEventToMain( new AWTDestroyEvent( widget ) ); -} |