diff options
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fb320a25c289..1aae24ea20e1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -68,10 +68,10 @@ #include <com/sun/star/office/Quickstart.hpp> #include <com/sun/star/linguistic2/XLinguProperties.hpp> +#include <vcl/vclenum.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/IconThemeInfo.hxx> -#include <vcl/toolbox.hxx> #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> #endif diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 0fa569248dd2..56fe90bff710 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -58,16 +58,6 @@ namespace o3tl template<> struct typed_flags<ToolBoxMenuType> : is_typed_flags<ToolBoxMenuType, 0x0003> {}; } -// small, large, size32 force an exact toolbox size for proper alignment -// DontCare will let the toolbox decide about its size -enum class ToolBoxButtonSize -{ - DontCare, - Small, - Large, - Size32, -}; - enum class ToolBoxLayoutMode { Normal, // traditional layout, items are centered in the toolbar diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index c7ced830da49..7d8728e90dc1 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -288,6 +288,16 @@ namespace o3tl template<> struct typed_flags<WizardButtonFlags> : is_typed_flags<WizardButtonFlags, 0x001f> {}; } +// small, large, size32 force an exact toolbox size for proper alignment +// DontCare will let the toolbox decide about its size +enum class ToolBoxButtonSize +{ + DontCare, + Small, + Large, + Size32, +}; + #endif // INCLUDED_VCL_VCLENUM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |