From 52403f0ff74a0a6ed5a8a4825d73fe7b8f3a6be4 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 15 Jun 2021 10:34:04 +0000 Subject: [PATCH] CtrlCore/CtrlLib: MacOS conditionals fixed to support Turtle git-svn-id: svn://ultimatepp.org/upp/trunk@15996 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/Coco.h | 2 ++ uppsrc/CtrlCore/CocoApp.mm | 2 +- uppsrc/CtrlCore/CocoChSysInit.cpp | 2 +- uppsrc/CtrlCore/CocoClip.mm | 2 +- uppsrc/CtrlCore/CocoCtrl.cpp | 2 +- uppsrc/CtrlCore/CocoDraw.mm | 2 +- uppsrc/CtrlCore/CocoDrawOp.mm | 2 +- uppsrc/CtrlCore/CocoDrawText.mm | 2 +- uppsrc/CtrlCore/CocoImage.mm | 2 +- uppsrc/CtrlCore/CocoMM.h | 6 +++++- uppsrc/CtrlCore/CocoProc.mm | 2 +- uppsrc/CtrlCore/CocoTop.cpp | 2 +- uppsrc/CtrlCore/CocoWin.mm | 2 +- uppsrc/CtrlCore/CocoWnd.cpp | 2 +- uppsrc/CtrlCore/CtrlKbd.cpp | 2 +- uppsrc/CtrlLib/Bar.h | 4 ++-- uppsrc/CtrlLib/ChCoco.cpp | 2 +- uppsrc/CtrlLib/ChCocoMM.mm | 6 ++++++ uppsrc/CtrlLib/Cocoa.mm | 2 +- uppsrc/CtrlLib/CtrlUtil.h | 2 +- uppsrc/CtrlLib/FileSel.cpp | 12 ++++++------ uppsrc/CtrlLib/MacMenu.mm | 5 +++-- uppsrc/CtrlLib/MenuBar.cpp | 12 ++++++------ uppsrc/CtrlLib/MenuItem.cpp | 2 +- uppsrc/CtrlLib/PrinterJob.cpp | 2 +- uppsrc/VirtualGui/VirtualGui.h | 4 ++-- 26 files changed, 50 insertions(+), 37 deletions(-) diff --git a/uppsrc/CtrlCore/Coco.h b/uppsrc/CtrlCore/Coco.h index 4dd8ccaf6..f06b3c48c 100644 --- a/uppsrc/CtrlCore/Coco.h +++ b/uppsrc/CtrlCore/Coco.h @@ -1,3 +1,5 @@ +#define GUI_COCOA + namespace Upp { struct PointCG; // represents CGPoint, used to isolate Cocoa/AppKit includes diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm index 4ab62f4f7..9511d7e6c 100644 --- a/uppsrc/CtrlCore/CocoApp.mm +++ b/uppsrc/CtrlCore/CocoApp.mm @@ -2,7 +2,7 @@ #define LLOG(x) // DLOG(x) -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA @interface AppDelegate : NSObject { diff --git a/uppsrc/CtrlCore/CocoChSysInit.cpp b/uppsrc/CtrlCore/CocoChSysInit.cpp index 8d9dd7473..048bb0893 100644 --- a/uppsrc/CtrlCore/CocoChSysInit.cpp +++ b/uppsrc/CtrlCore/CocoChSysInit.cpp @@ -1,6 +1,6 @@ #include -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #include diff --git a/uppsrc/CtrlCore/CocoClip.mm b/uppsrc/CtrlCore/CocoClip.mm index 2d2fabefd..b853ddec9 100644 --- a/uppsrc/CtrlCore/CocoClip.mm +++ b/uppsrc/CtrlCore/CocoClip.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #define LLOG(x) // LOG(x) diff --git a/uppsrc/CtrlCore/CocoCtrl.cpp b/uppsrc/CtrlCore/CocoCtrl.cpp index bc30625cd..cbcfc311a 100644 --- a/uppsrc/CtrlCore/CocoCtrl.cpp +++ b/uppsrc/CtrlCore/CocoCtrl.cpp @@ -1,6 +1,6 @@ #include -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #define LLOG(x) // DLOG(x) diff --git a/uppsrc/CtrlCore/CocoDraw.mm b/uppsrc/CtrlCore/CocoDraw.mm index 98f4ffe66..e6c5c20e9 100644 --- a/uppsrc/CtrlCore/CocoDraw.mm +++ b/uppsrc/CtrlCore/CocoDraw.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA namespace Upp { diff --git a/uppsrc/CtrlCore/CocoDrawOp.mm b/uppsrc/CtrlCore/CocoDrawOp.mm index d199b5370..0a6f0e76b 100644 --- a/uppsrc/CtrlCore/CocoDrawOp.mm +++ b/uppsrc/CtrlCore/CocoDrawOp.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA namespace Upp { diff --git a/uppsrc/CtrlCore/CocoDrawText.mm b/uppsrc/CtrlCore/CocoDrawText.mm index 0b20c5553..2150ed73a 100644 --- a/uppsrc/CtrlCore/CocoDrawText.mm +++ b/uppsrc/CtrlCore/CocoDrawText.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #define LLOG(x) #define LTIMING(x) diff --git a/uppsrc/CtrlCore/CocoImage.mm b/uppsrc/CtrlCore/CocoImage.mm index 50dadf95a..ba944324e 100644 --- a/uppsrc/CtrlCore/CocoImage.mm +++ b/uppsrc/CtrlCore/CocoImage.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #define LLOG(x) diff --git a/uppsrc/CtrlCore/CocoMM.h b/uppsrc/CtrlCore/CocoMM.h index 208fadbf3..f0b45d6c0 100644 --- a/uppsrc/CtrlCore/CocoMM.h +++ b/uppsrc/CtrlCore/CocoMM.h @@ -3,7 +3,7 @@ #include -#ifdef PLATFORM_COCOA +#if defined(PLATFORM_COCOA) && !defined(VIRTUALGUI) #define Point NS_Point #define Rect NS_Rect @@ -13,8 +13,12 @@ #undef Rect #undef Size +#endif + #include "CtrlCore.h" +#ifdef GUI_COCOA + namespace Upp { template diff --git a/uppsrc/CtrlCore/CocoProc.mm b/uppsrc/CtrlCore/CocoProc.mm index 1f52b943f..49e237f35 100644 --- a/uppsrc/CtrlCore/CocoProc.mm +++ b/uppsrc/CtrlCore/CocoProc.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA NSEvent *sCurrentMouseEvent__; // needed for drag operation diff --git a/uppsrc/CtrlCore/CocoTop.cpp b/uppsrc/CtrlCore/CocoTop.cpp index c8641b764..0b94a0f06 100644 --- a/uppsrc/CtrlCore/CocoTop.cpp +++ b/uppsrc/CtrlCore/CocoTop.cpp @@ -1,6 +1,6 @@ #include -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA NAMESPACE_UPP diff --git a/uppsrc/CtrlCore/CocoWin.mm b/uppsrc/CtrlCore/CocoWin.mm index ee921ce94..927d299db 100644 --- a/uppsrc/CtrlCore/CocoWin.mm +++ b/uppsrc/CtrlCore/CocoWin.mm @@ -1,6 +1,6 @@ #include "CocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA #define LLOG(x) diff --git a/uppsrc/CtrlCore/CocoWnd.cpp b/uppsrc/CtrlCore/CocoWnd.cpp index 0c170836f..7a77ee5aa 100644 --- a/uppsrc/CtrlCore/CocoWnd.cpp +++ b/uppsrc/CtrlCore/CocoWnd.cpp @@ -1,6 +1,6 @@ #include -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA NAMESPACE_UPP diff --git a/uppsrc/CtrlCore/CtrlKbd.cpp b/uppsrc/CtrlCore/CtrlKbd.cpp index 4a42f09eb..c1bfa2076 100644 --- a/uppsrc/CtrlCore/CtrlKbd.cpp +++ b/uppsrc/CtrlCore/CtrlKbd.cpp @@ -389,7 +389,7 @@ Tuple KeyNames__[ ] = { { K_PLUS, tt_("key\v[+]") }, { K_MINUS, tt_("key\v[-]") }, { K_COMMA, tt_("key\v[,]") }, { K_PERIOD, tt_("key\v[.]") }, { K_SEMICOLON, tt_("key\v[;]") }, { K_SLASH, tt_("key\v[/]") }, { K_GRAVE, tt_("key\v[`]") }, { K_LBRACKET, tt_("key\v[[]") }, { K_BACKSLASH, tt_("key\v[\\]") }, { K_RBRACKET, tt_("key\v[]]") }, { K_QUOTEDBL, tt_("key\v[']") }, -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA { K_OPTION_KEY, tt_("key\vOption") }, #endif { IK_DBL_CLICK, tt_("key\v[double-click]") }, diff --git a/uppsrc/CtrlLib/Bar.h b/uppsrc/CtrlLib/Bar.h index 15947c0dd..014401f05 100644 --- a/uppsrc/CtrlLib/Bar.h +++ b/uppsrc/CtrlLib/Bar.h @@ -347,7 +347,7 @@ private: bool nodarkadjust; bool action_taken = false; // local menu resulted in action invoked (not cancel) -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA One host_bar; bool ExecuteHostBar(Ctrl *owner, Point p); void CreateHostBar(One& bar); @@ -415,7 +415,7 @@ public: MenuBar& MaxIconSize(Size sz) { maxiconsize = sz; return *this; } Size GetMaxIconSize() const { return maxiconsize; } MenuBar& NoDarkAdjust(bool b = true) { nodarkadjust = b; return *this; } -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA MenuBar& UppMenu() { host_bar.Clear(); return *this; } #endif diff --git a/uppsrc/CtrlLib/ChCoco.cpp b/uppsrc/CtrlLib/ChCoco.cpp index 7728a371c..c19375ed5 100644 --- a/uppsrc/CtrlLib/ChCoco.cpp +++ b/uppsrc/CtrlLib/ChCoco.cpp @@ -1,7 +1,7 @@ #include "CtrlLib.h" #include "ChCocoMM.h" -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA namespace Upp { diff --git a/uppsrc/CtrlLib/ChCocoMM.mm b/uppsrc/CtrlLib/ChCocoMM.mm index 73474fc7f..d6860ea3e 100644 --- a/uppsrc/CtrlLib/ChCocoMM.mm +++ b/uppsrc/CtrlLib/ChCocoMM.mm @@ -3,7 +3,13 @@ #ifdef PLATFORM_COCOA #include + +#endif + #include + +#ifdef GUI_COCOA + #include #include "ChCocoMM.h" diff --git a/uppsrc/CtrlLib/Cocoa.mm b/uppsrc/CtrlLib/Cocoa.mm index fb35f6d01..bf8d6a8fa 100644 --- a/uppsrc/CtrlLib/Cocoa.mm +++ b/uppsrc/CtrlLib/Cocoa.mm @@ -5,7 +5,7 @@ namespace Upp { -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA FileSelNative::FileSelNative() { diff --git a/uppsrc/CtrlLib/CtrlUtil.h b/uppsrc/CtrlLib/CtrlUtil.h index 092e71704..4a663c1c1 100644 --- a/uppsrc/CtrlLib/CtrlUtil.h +++ b/uppsrc/CtrlLib/CtrlUtil.h @@ -52,7 +52,7 @@ struct Win32PrintDlg_; #ifndef PLATFORM_WINCE -#if defined(GUI_WIN) || defined(PLATFORM_X11) || defined(PLATFORM_COCOA) +#ifndef VIRTUALGUI class PrinterJob { #ifdef GUI_WIN diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp index 577b8f1df..485c14918 100644 --- a/uppsrc/CtrlLib/FileSel.cpp +++ b/uppsrc/CtrlLib/FileSel.cpp @@ -398,7 +398,7 @@ Image GetFileIcon(const String& folder, const String& filename, bool isdir, bool #endif -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA struct FileIconMaker : ImageMaker { String file; bool exe; @@ -464,7 +464,7 @@ Image NativePathIcon0(const char *path, bool folder, bool large) #ifdef PLATFORM_POSIX String p = path; FindFile ff(path); -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA return GetFileIcon(path, folder, ff.GetMode() & 0111, large); #else bool isdrive = folder && ((p == "/media") || (p == "/mnt")); @@ -529,7 +529,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs, filesystem.Find(AppendFileName(dir, filesystem.IsWin32() ? "*.*" : "*")); if(ffi.IsEmpty()) return false; - #if defined(PLATFORM_POSIX) && !defined(PLATFORM_COCOA) + #if defined(PLATFORM_POSIX) && !defined(GUI_COCOA) bool isdrive = dir == "/media" || dir == "/mnt"; #endif for(int t = 0; t < ffi.GetCount(); t++) { @@ -549,7 +549,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs, MatchSearch(fi.filename, search) && show) { Image img; #ifdef PLATFORM_POSIX - #ifdef PLATFORM_COCOA + #ifdef GUI_COCOA img = GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, fi.unix_mode & 0111, false, lazyicons); #else img = isdrive ? PosixGetDriveImage(fi.filename, false) @@ -2178,7 +2178,7 @@ FileSel& FileSel::AddPlace(const String& path, const Image& m, const String& nam FileSel& FileSel::AddPlace(const String& path, const String& name, const char* group, int row) { -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA return AddPlace(path, GetFileIcon(NormalizePath(path), true, false, false), name, group, row); #else return AddPlace(path, GetDirIcon(NormalizePath(path)), name, group, row); @@ -2248,7 +2248,7 @@ void FileSel::AddSystemPlaces(int row) FileSel& FileSel::AddStandardPlaces() { AddPlace(GetHomeDirectory(), t_("Home"), "PLACES:FOLDER"); -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA AddPlace(GetSpecialDirectory(SF_NSDesktopDirectory), t_("Desktop"), "PLACES:FOLDER"); AddPlace(GetSpecialDirectory(SF_NSMusicDirectory), t_("Music"), "PLACES:FOLDER"); AddPlace(GetSpecialDirectory(SF_NSPicturesDirectory), t_("Pictures"), "PLACES:FOLDER"); diff --git a/uppsrc/CtrlLib/MacMenu.mm b/uppsrc/CtrlLib/MacMenu.mm index c269cfe13..9ac9ab6fc 100644 --- a/uppsrc/CtrlLib/MacMenu.mm +++ b/uppsrc/CtrlLib/MacMenu.mm @@ -1,9 +1,10 @@ #ifndef flagSKELETON #include -#include -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA + +#include #define LLOG(x) // DLOG(x) diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp index e9fa05f53..7495d2aed 100644 --- a/uppsrc/CtrlLib/MenuBar.cpp +++ b/uppsrc/CtrlLib/MenuBar.cpp @@ -72,7 +72,7 @@ MenuBar::MenuBar() arealook = -1; maxiconsize = Null; nodarkadjust = false; -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA CreateHostBar(host_bar); #endif } @@ -124,7 +124,7 @@ void MenuBar::Clear() Bar::Item& MenuBar::AddItem(Event<> cb) { LLOG("MenuBar::AddItem " << Name()); -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA if(host_bar && !IsChild()) return host_bar->AddItem(cb); #endif @@ -148,7 +148,7 @@ Bar::Item& MenuBar::AddItem(Event<> cb) Bar::Item& MenuBar::AddSubMenu(Event proc) { LLOG("MenuBar::AddSubMenu " << Name()); -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA if(host_bar && !IsChild()) return host_bar->AddSubMenu(proc); #endif @@ -178,7 +178,7 @@ Bar::Item& MenuBar::AddSubMenu(Event proc) void MenuBar::Separator() { -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA if(host_bar && !IsChild()) return host_bar->Separator(); #endif @@ -604,7 +604,7 @@ void MenuBar::PopUp(Ctrl *owner, Point p, Size rsz) bool MenuBar::IsEmpty() const { -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA if(host_bar && !IsChild()) return host_bar->IsEmpty(); #endif @@ -619,7 +619,7 @@ bool MenuBar::Execute(Ctrl *owner, Point p) return false; ows.Add(owner); action_taken = false; -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA if(host_bar && !IsChild()) action_taken = ExecuteHostBar(owner, p); else diff --git a/uppsrc/CtrlLib/MenuItem.cpp b/uppsrc/CtrlLib/MenuItem.cpp index b4be0b8d8..7c49c696f 100644 --- a/uppsrc/CtrlLib/MenuItem.cpp +++ b/uppsrc/CtrlLib/MenuItem.cpp @@ -422,7 +422,7 @@ void SubMenuBase::Pull(Ctrl *item, Point p, Size sz) menu.KillDelayedClose(); if(!item->IsOpen() || menu.IsOpen()) return; menu.Clear(); -#ifdef PLATFORM_COCOA +#ifdef GUI_COCOA menu.UppMenu(); #endif if(parentmenu) diff --git a/uppsrc/CtrlLib/PrinterJob.cpp b/uppsrc/CtrlLib/PrinterJob.cpp index 0b6e869eb..af7570fef 100644 --- a/uppsrc/CtrlLib/PrinterJob.cpp +++ b/uppsrc/CtrlLib/PrinterJob.cpp @@ -154,7 +154,7 @@ PrinterJob& PrinterJob::CurrentPage(int i) #endif -#if defined(PLATFORM_X11) || defined(PLATFORM_COCOA) +#if (defined(PLATFORM_X11) || defined(PLATFORM_COCOA)) && !defined(VIRTUALGUI) struct PageSizeName { const char *name; diff --git a/uppsrc/VirtualGui/VirtualGui.h b/uppsrc/VirtualGui/VirtualGui.h index f1177ea42..82a3c9928 100644 --- a/uppsrc/VirtualGui/VirtualGui.h +++ b/uppsrc/VirtualGui/VirtualGui.h @@ -107,11 +107,11 @@ class TopWindowFrame; #define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE class PrinterJob { // Dummy only... - NilDraw nil; + NilDraw nil_; Vector pages; public: - Draw& GetDraw() { return nil; } + Draw& GetDraw() { return nil_; } operator Draw&() { return GetDraw(); } const Vector& GetPages() const { return pages; } int operator[](int i) const { return 0; }