Commit 959330dd authored by bliss administrator's avatar bliss administrator
Browse files

removed QtXEmbed from qttools

parent 60079da9
......@@ -24,83 +24,6 @@ public:
static void set_qt_resolve_symlinks(bool);
};
class QtXEmbedClient : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
public:
QtXEmbedClient(QWidget* = 0, const char * = 0);
~QtXEmbedClient();
void embedInto(WId);
WId containerWinId() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void embedded();
void containerClosed();
void error(int);
protected:
bool eventFilter(QObject *, QEvent *);
void setEmbedded();
};
class QtXEmbedContainer : QWidget
{
%TypeHeaderCode
#include <qvariant.h>
#include <qtxembed.h>
%End
public:
QtXEmbedContainer(QWidget* = 0,const char * = 0);
~QtXEmbedContainer();
void embed(WId,bool = true);
void discardClient();
WId clientWinId() const;
QSize minimumSizeHint() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void clientIsEmbedded();
void clientClosed();
void error(int);
protected:
bool eventFilter(QObject *, QEvent *);
void resizeEvent(QResizeEvent *);
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
bool isEmbedded() const;
void moveInputToProxy();
void acceptClient(WId);
void rejectClient(WId);
void checkGrab();
WId topLevelParentWinId() const;
};
class QubImage : QImage
{
%TypeHeaderCode
......
This diff is collapsed.
/***************************************************************************
** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file
** LICENSE.QPL included in the packaging of this file.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
*/
#ifndef QTXEMBED_H
#define QTXEMBED_H
#include <qguardedptr.h>
#include <qwidget.h>
#include <X11/Xlib.h>
class QtXEmbedClient : public QWidget
{
Q_OBJECT
public:
QtXEmbedClient(QWidget *parent = 0, const char *name = 0);
~QtXEmbedClient();
void embedInto(WId id);
WId containerWinId() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void embedded();
void containerClosed();
void error(int);
protected:
bool x11Event(XEvent *);
bool eventFilter(QObject *, QEvent *);
void setEmbedded();
private:
int focusOriginator;
WId container;
QGuardedPtr<QWidget> currentFocus;
};
class QtXEmbedContainer : public QWidget
{
Q_OBJECT
public:
QtXEmbedContainer(QWidget *parent = 0, const char *name = 0);
~QtXEmbedContainer();
void embed(WId id, bool xEmbedClient = true);
void discardClient();
WId clientWinId() const;
QSize minimumSizeHint() const;
enum Errors {
Unknown = 0,
Internal = 1,
InvalidWindowID = 2
};
signals:
void clientIsEmbedded();
void clientClosed();
void error(int);
protected:
bool x11Event(XEvent *);
bool eventFilter(QObject *, QEvent *);
void resizeEvent(QResizeEvent *);
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
bool isEmbedded() const;
void moveInputToProxy();
void acceptClient(WId window);
void rejectClient(WId window);
void checkGrab();
WId topLevelParentWinId() const;
private:
WId client;
QWidget *focusProxy;
bool clientIsXEmbed;
bool xgrab;
QRect clientOriginalRect;
QSize wmMinimumSizeHint;
};
#endif
......@@ -72,9 +72,9 @@ mar345_module = Extension(name = "Qub.CTools/mar345",
include_dirs = ['Qub/CTools/mar345',numpy.get_include()])
qttools_module = Extension(name = "Qub.CTools/qttools",
sources = ["Qub/CTools/qttools/%s.sip" % (QT3 and "qttools_qt3" or "qttools_qt4")]+glob.glob('Qub/CTools/qttools/qttools*cpp'),
sources = ["Qub/CTools/qttools/%s.sip" % (QT3 and "qttools_qt3" or "qttools_qt4")]+glob.glob('Qub/CTools/qttools/*cpp'),
extra_compile_args = extra_compile_args,
extra_link_args = extra_link_args+['-l'+qt_lib],
extra_link_args = extra_link_args+['-l'+qt_lib, '-lXext', '-lX11'],
include_dirs = ['Qub/CTools/qttools',numpy.get_include(), qt_inc_dir],
library_dirs = [qt_lib_dir])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment