diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:36:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:36:15 +0000 |
| commit | 234910c3778958acd6ef2b6644ae494f4a460af1 (patch) | |
| tree | d0dacec9d00a78ea7ccda864fcb81e9561f9fb1f /vcl/unx/source/app | |
| parent | 787d91f87175d65508112d62d45546e040121f69 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.45.12); FILE MERGED
2003/12/16 18:15:46 mt 1.45.12.3: #i23061# And more cleanups...
2003/12/10 15:59:48 mt 1.45.12.2: #i23061# VCL cleanup, removed headers, methods and types...
2003/12/05 13:29:07 mt 1.45.12.1: #i23061# Code cleanups, fixed gcc WAll warnings, removed unused variables and unused code
Diffstat (limited to 'vcl/unx/source/app')
| -rw-r--r-- | vcl/unx/source/app/wmadaptor.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index 36850daa2c91..6e1f53ec01d2 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wmadaptor.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2003-11-18 14:44:15 $ + * last change: $Author: vg $ $Date: 2004-01-06 14:36:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -315,11 +315,7 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : &pProperty) == 0 && nItems)) { -#if NeedWidePrototypes - if (*(sal_Int32*)pProperty) -#else if (*pProperty) -#endif { m_aWMName = String(RTL_CONSTASCII_USTRINGPARAM("Dtwm")); m_bTransientBehaviour = false; @@ -597,7 +593,6 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : unsigned long nItems = 0; unsigned long nBytesLeft = 0; unsigned char* pProperty = NULL; - bool bGnomeWM = false; initAtoms(); @@ -1404,13 +1399,6 @@ void NetWMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType switch( eType ) { case windowType_Utility: -#if 0 - // advertise tool windows as dialogues not utilities for now - // due to a bug in metacity 2.4.34 (smaller titlebar font on - // resizable utility windows) - eWMType = m_aWMAtoms[ NET_WM_WINDOW_TYPE_UTILITY ] ? NET_WM_WINDOW_TYPE_UTILITY : NET_WM_WINDOW_TYPE_DIALOG; - break; -#endif case windowType_ModelessDialogue: case windowType_ModalDialogue: eWMType = NET_WM_WINDOW_TYPE_DIALOG; |