diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 12:24:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 12:36:46 +0000 |
| commit | 20915bcbf45b4b0b4bc8c68c7df9eb6b13abbe06 (patch) | |
| tree | a4f00de440590b550f5ca0b44c28592b7319a39f /vcl/inc | |
| parent | eb1352bb40b3571ee215d6f8bf0c8a0a85297aa4 (diff) | |
convert WMWindowType to scoped enum
and drop read-only ModalDialog enumerator
Change-Id: Ie295e4863381401c73bd2a4151b94ad529c261fd
Reviewed-on: https://gerrit.libreoffice.org/34023
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/salframe.h | 13 | ||||
| -rw-r--r-- | vcl/inc/unx/wmadaptor.hxx | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 16efb896e8cf..510ebd199849 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -50,6 +50,17 @@ namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; } #define SHOWSTATE_NORMAL 1 #define SHOWSTATE_HIDDEN 2 +enum class WMWindowType +{ + Normal, + ModalDialogue, + ModelessDialogue, + Utility, + Splash, + Toolbar, + Dock +}; + class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandleProvider { friend class vcl_sal::WMAdaptor; @@ -103,7 +114,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl Timer maAlwaysOnTopRaiseTimer; // data for WMAdaptor - int meWindowType; + WMWindowType meWindowType; int mnDecorationFlags; bool mbMaximizedVert; bool mbMaximizedHorz; diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 817cea494b85..fbd87f96a8ef 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -27,6 +27,7 @@ #include <X11/Xutil.h> #include <vclpluginapi.h> +#include "salframe.h" #include <vector> class SalDisplay; @@ -124,20 +125,6 @@ public: static const int decoration_CloseBtn = 0x00000020; static const int decoration_All = 0x10000000; - /* - * window type - */ - enum WMWindowType - { - windowType_Normal, - windowType_ModalDialogue, - windowType_ModelessDialogue, - windowType_Utility, - windowType_Splash, - windowType_Toolbar, - windowType_Dock - }; - protected: SalDisplay* m_pSalDisplay; // Display to use Display* m_pDisplay; // X Display of SalDisplay |