Revert "tdf#92630 Enable auto-accelerator behaviour for gtk"

This reverts commit e982c60bb8ca5d3c3ca66e0810cf459c444aa3aa.

Change-Id: I3c903b519180f524aabb6060d0afef3b9b5cb143

5 files changed, 21 insertions, 29 deletions

diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index b85f561ce254..6741a229dd4d 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -41,9 +41,6 @@ protected:
 
 private:
     bool                    mbHasControlFocus;
-    bool                    mbFont;
-    bool                    mbForeground;
-    bool                    mbShowAccelerator;
     Link<>                  maGetFocusHdl;
     Link<>                  maLoseFocusHdl;
 
@@ -185,8 +182,6 @@ public:
     OutputDevice*   GetReferenceDevice() const;
 
     vcl::Font       GetUnzoomedControlPointFont() const;
-    void            SetShowAccelerator (bool val);
-    bool            GetShowAccelerator (void) const;
 };
 
 #endif // INCLUDED_VCL_CTRL_HXX
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 1325231d1914..2dc4cc38ee49 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -107,7 +107,6 @@ public:
 private:
     bool            ImplStartExecuteModal();
     static void     ImplEndExecuteModal();
-    bool            ImplHandleCmdEvent ( const CommandEvent& rCEvent );
 public:
 
     // Dialog::Execute replacement API
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 7e4b6d5ce2cd..90d0f2d5ff73 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -786,7 +786,6 @@ inline bool isContainerWindow(const vcl::Window &rWindow)
 {
     WindowType eType = rWindow.GetType();
     return eType == WINDOW_CONTAINER || eType == WINDOW_SCROLLWINDOW ||
-            eType == WINDOW_TABCONTROL || eType == WINDOW_TABPAGE ||
            (eType == WINDOW_DOCKINGWINDOW && ::isLayoutEnabled(&rWindow));
 }
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6636c8f8886d..57e6f0faf2f2 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -44,7 +44,6 @@ class HelpEvent;
 class Image;
 class PopupMenu;
 class KeyEvent;
-class CommandEvent;
 class MenuFloatingWindow;
 namespace vcl { class Window; }
 class SalMenu;
@@ -444,7 +443,6 @@ class VCL_DLLPUBLIC MenuBar : public Menu
                                                   MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame);
     SAL_DLLPRIVATE static void ImplDestroy(MenuBar* pMenu, bool bDelete);
     SAL_DLLPRIVATE bool ImplHandleKeyEvent(const KeyEvent& rKEvent, bool bFromMenu = true);
-    SAL_DLLPRIVATE bool ImplHandleCmdEvent(const CommandEvent& rCEvent);
 
 protected:
 
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 16723fd4eaf1..dbd57e6ad339 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -160,29 +160,30 @@ typedef std::vector< Rectangle > MetricVector;
 // Flags for DrawText()
 enum class DrawTextFlags
 {
-    NONE                  = 0x00000000,
-    Disable               = 0x00000001,
-    Mnemonic              = 0x00000002,
-    Mono                  = 0x00000004,
-    Clip                  = 0x00000008,
-    Left                  = 0x00000010,
-    Center                = 0x00000020,
-    Right                 = 0x00000040,
-    Top                   = 0x00000080,
-    VCenter               = 0x00000100,
-    Bottom                = 0x00000200,
-    EndEllipsis           = 0x00000400,
-    PathEllipsis          = 0x00000800,
-    MultiLine             = 0x00001000,
-    WordBreak             = 0x00002000,
-    NewsEllipsis          = 0x00004000,
-    WordBreakHyphenation  = 0x00008000 | WordBreak,
-    CenterEllipsis        = 0x00010000,
-    HideMnemonic          = 0x00020000,
+    NONE                  = 0x0000,
+    Disable               = 0x0001,
+    Mnemonic              = 0x0002,
+    Mono                  = 0x0004,
+    Clip                  = 0x0008,
+    Left                  = 0x0010,
+    Center                = 0x0020,
+    Right                 = 0x0040,
+    Top                   = 0x0080,
+    VCenter               = 0x0100,
+    Bottom                = 0x0200,
+    EndEllipsis           = 0x0400,
+    PathEllipsis          = 0x0800,
+    MultiLine             = 0x1000,
+    WordBreak             = 0x2000,
+    NewsEllipsis          = 0x4000,
+    // in the long run we should make text style flags longer
+    // but at the moment we can get away with this 2 bit field for ellipsis style
+    CenterEllipsis        = EndEllipsis | PathEllipsis,
+    WordBreakHyphenation  = 0x8000 | WordBreak,
 };
 namespace o3tl
 {
-    template<> struct typed_flags<DrawTextFlags> : is_typed_flags<DrawTextFlags, 0x3ffff> {};
+    template<> struct typed_flags<DrawTextFlags> : is_typed_flags<DrawTextFlags, 0xffff> {};
 }
 
 // Flags for DrawImage(), these must match the definitions in css::awt::ImageDrawMode