From 062d6d8263973a5ffade2d5a2a5c0795ebb9d47f Mon Sep 17 00:00:00 2001
From: mgubi <mgubi@64cb5145-927a-446d-8aed-2fb7b4773692>
Date: Fri, 18 Dec 2009 21:05:24 +0000
Subject: [PATCH] fixed for main menu & focus bugs

git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2896 64cb5145-927a-446d-8aed-2fb7b4773692
---
 src/src/Plugins/Qt/QTMScrollView.cpp |  1 +
 src/src/Plugins/Qt/qt_widget.cpp     | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/src/Plugins/Qt/QTMScrollView.cpp b/src/src/Plugins/Qt/QTMScrollView.cpp
index ecf4aed5..16a8687c 100644
--- a/src/src/Plugins/Qt/QTMScrollView.cpp
+++ b/src/src/Plugins/Qt/QTMScrollView.cpp
@@ -21,6 +21,7 @@ QTMScrollView::QTMScrollView ( QWidget *_parent )
   : QAbstractScrollArea (_parent) {
 	QWidget *_viewport = QAbstractScrollArea::viewport();
 	_viewport->setAttribute(Qt::WA_OpaquePaintEvent);
+    _viewport->setAttribute(Qt::WA_MacNoClickThrough);
 	//_viewport->setAttribute(Qt::WA_StaticContents);
   //  _viewport->setAttribute(Qt::WA_PaintOnScreen); 
     // the above option disable double-buffering on X11
diff --git a/src/src/Plugins/Qt/qt_widget.cpp b/src/src/Plugins/Qt/qt_widget.cpp
index b5289cff..73489099 100755
--- a/src/src/Plugins/Qt/qt_widget.cpp
+++ b/src/src/Plugins/Qt/qt_widget.cpp
@@ -286,8 +286,10 @@ qt_tm_widget_rep::qt_tm_widget_rep(int mask, command _quit):
 
   QMainWindow* mw= tm_mainwindow ();
   mw->setStyle (qtmstyle ());
+#ifndef Q_WS_MAC
   mw->menuBar()->setStyle (qtmstyle ());
-
+#endif
+  
   QStackedWidget* tw = new QStackedWidget ();
   mw->setCentralWidget(tw);
   
@@ -667,7 +669,16 @@ qt_tm_widget_rep::write (slot s, blackbox index, widget w) {
       main_menu_widget = w;
       QMenu* m= to_qmenu (w);
       if (m) {
-        replaceActions (tm_mainwindow()->menuBar (), m);
+#ifdef Q_WS_MAC
+        static QMenuBar *app_menubar = NULL;
+        if (!app_menubar) {
+          app_menubar = new QMenuBar(NULL);
+          app_menubar->setStyle (qtmstyle ());
+        }
+        if (app_menubar) replaceActions (app_menubar, m);
+#else
+        replaceActions (tm_mainwindow()->menuBar(), m);
+#endif
       }
     }
     break;
-- 
2.11.4.GIT