summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-09-09 15:24:31 +0000
committerOliver Bolte <obo@openoffice.org>2004-09-09 15:24:31 +0000
commitae50c0a522ca9ebee383da9905bab6aff9982338 (patch)
treeaeca5096b3b02ae1cf9299b0a4a3bbf5be425eaf /vcl
parentba2c984530d4c3a2e619083849eb8c25049dcafa (diff)
INTEGRATION: CWS toolbars2 (1.19.176); FILE MERGED
2004/09/02 13:08:39 pl 1.19.176.3: #i32198# avoid decorated toolbars on KDE3.1 2004/08/19 17:07:58 pl 1.19.176.2: #i32198# add: WM_TAKE_FOCUS 2004/08/13 16:06:31 pl 1.19.176.1: #i32198# use NET_WM_WINDOW_TYPE_TOOLBAR windows for EWMH compliant WMs
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/inc/wmadaptor.hxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx
index 643a52386607..418ae3c0bc3a 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/unx/inc/wmadaptor.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: wmadaptor.hxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: kz $ $Date: 2003-11-18 14:39:55 $
+ * last change: $Author: obo $ $Date: 2004-09-09 16:24:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -109,6 +109,7 @@ public:
NET_WM_WINDOW_TYPE_MENU,
NET_WM_WINDOW_TYPE_NORMAL,
NET_WM_WINDOW_TYPE_TOOLBAR,
+ KDE_NET_WM_WINDOW_TYPE_OVERRIDE,
NET_WM_WINDOW_TYPE_SPLASH,
NET_WM_WINDOW_TYPE_UTILITY,
NET_NUMBER_OF_DESKTOPS,
@@ -134,6 +135,7 @@ public:
MOTIF_WM_HINTS,
WM_PROTOCOLS,
WM_DELETE_WINDOW,
+ WM_TAKE_FOCUS,
WM_SAVE_YOURSELF,
WM_CLIENT_LEADER,
WM_COMMAND,
@@ -169,7 +171,8 @@ public:
windowType_ModalDialogue,
windowType_ModelessDialogue,
windowType_Utility,
- windowType_Splash
+ windowType_Splash,
+ windowType_Toolbar
};
protected:
@@ -263,6 +266,11 @@ public:
bool supportsSplash() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_SPLASH ] != 0; }
/*
+ * tells whteher there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR
+ */
+ bool supportsToolbar() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_TOOLBAR ] != 0; }
+
+ /*
* enables always on top or equivalent if possible
*/
virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const;