FixedBitmap can be in a toolkit only header

Change-Id: I22bb548f7f0c1ef0de157f99915fbaf6473c284b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96861
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 65 insertions, 44 deletions

diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 9c4005559210..fdfda987b900 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -21,12 +21,9 @@
 #define INCLUDED_VCL_FIXED_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/bitmapex.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/image.hxx>
 
-
 class VCL_DLLPUBLIC FixedText : public Control
 {
 private:
@@ -75,16 +72,6 @@ public:
     vcl::Window*    get_mnemonic_widget() const { return m_pMnemonicWindow; }
 };
 
-class SelectableFixedText final : public Edit
-{
-public:
-    explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle );
-
-    virtual void    LoseFocus() override;
-    virtual void    ApplySettings(vcl::RenderContext&) override;
-};
-
-
 class VCL_DLLPUBLIC FixedLine : public Control
 {
 private:
@@ -115,32 +102,6 @@ public:
     virtual Size    GetOptimalSize() const override;
 };
 
-class VCL_DLLPUBLIC FixedBitmap final : public Control
-{
-private:
-    BitmapEx        maBitmap;
-
-    using Control::ImplInitSettings;
-    using Window::ImplInit;
-    SAL_DLLPRIVATE void    ImplInit( vcl::Window* pParent, WinBits nStyle );
-    SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
-    SAL_DLLPRIVATE void    ImplDraw( OutputDevice* pDev, const Point& rPos, const Size& rSize );
-
-public:
-    explicit        FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 );
-
-    virtual void    ApplySettings(vcl::RenderContext&) override;
-
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
-    virtual void    Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override;
-    virtual void    Resize() override;
-    virtual void    StateChanged( StateChangedType nType ) override;
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
-
-    void            SetBitmap( const BitmapEx& rBitmap );
-};
-
-
 class VCL_DLLPUBLIC FixedImage : public Control
 {
 private:
diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx
index 7912520059e5..57cb006b7a38 100644
--- a/include/vcl/salvtables.hxx
+++ b/include/vcl/salvtables.hxx
@@ -16,7 +16,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/spinfld.hxx>
-#include <vcl/fixed.hxx>
+#include <vcl/toolkit/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/toolkit/combobox.hxx>
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx
new file mode 100644
index 000000000000..5e495101d71f
--- /dev/null
+++ b/include/vcl/toolkit/fixed.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
+
+#include <vcl/dllapi.h>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
+
+class SelectableFixedText final : public Edit
+{
+public:
+    explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle );
+
+    virtual void    LoseFocus() override;
+    virtual void    ApplySettings(vcl::RenderContext&) override;
+};
+
+class VCL_DLLPUBLIC FixedBitmap final : public Control
+{
+private:
+    BitmapEx        maBitmap;
+
+    using Control::ImplInitSettings;
+    using Window::ImplInit;
+    SAL_DLLPRIVATE void    ImplInit( vcl::Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
+    SAL_DLLPRIVATE void    ImplDraw( OutputDevice* pDev, const Point& rPos, const Size& rSize );
+
+public:
+    explicit        FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 );
+
+    virtual void    ApplySettings(vcl::RenderContext&) override;
+
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
+    virtual void    Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override;
+    virtual void    Resize() override;
+    virtual void    StateChanged( StateChangedType nType ) override;
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
+
+    void            SetBitmap( const BitmapEx& rBitmap );
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/group.hxx b/include/vcl/toolkit/group.hxx
index 2bbd344dfda1..b6d7da71ee93 100644
--- a/include/vcl/toolkit/group.hxx
+++ b/include/vcl/toolkit/group.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_GROUP_HXX
-#define INCLUDED_VCL_GROUP_HXX
+#pragma once
 
 #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
 #error "don't use this in new code"
@@ -55,6 +54,4 @@ public:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 };
 
-#endif // INCLUDED_VCL_GROUP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */