mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
use consistent ifdefs for the mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23788 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f2e8cd3cd9
commit
ad00d81144
@ -168,7 +168,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
|
||||
if (lyxrc.quit_on_last_window_closed)
|
||||
setQuitOnLastWindowClosed(false);
|
||||
*/
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_WS_MACX
|
||||
// FIXME: Do we need a lyxrc setting for this on Mac? This behaviour
|
||||
// seems to be the default case for applications like LyX.
|
||||
setQuitOnLastWindowClosed(false);
|
||||
|
@ -659,7 +659,7 @@ bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e)
|
||||
|
||||
void GuiLayoutBox::setIconSize(QSize size)
|
||||
{
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_WS_MACX
|
||||
bool small = size.height() < 20;
|
||||
setAttribute(Qt::WA_MacSmallSize, small);
|
||||
setAttribute(Qt::WA_MacNormalSize, !small);
|
||||
|
@ -549,7 +549,7 @@ void GuiView::on_currentWorkAreaChanged(GuiWorkArea * wa)
|
||||
|
||||
void GuiView::on_lastWorkAreaRemoved()
|
||||
{
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_WS_MACX
|
||||
// On Mac close the view if there is no Tab open anymore,
|
||||
// but only if no splitter is visible
|
||||
if (!lyxrc.open_buffers_in_tabs && d.splitter_->count() == 1) {
|
||||
|
@ -46,7 +46,7 @@
|
||||
#include <QContextMenuEvent>
|
||||
#include <QInputContext>
|
||||
#include <QHelpEvent>
|
||||
#ifdef Q_WS_MAC
|
||||
#ifdef Q_WS_MACX
|
||||
#include <QMacStyle>
|
||||
#endif
|
||||
#include <QMainWindow>
|
||||
|
Loading…
Reference in New Issue
Block a user