smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Replace old required mac os version checks with if WINAPI_CARBON

Browse source
This commit is contained in:
sithlord48 2025-04-26 11:41:05 -04:00 committed by Nick Bolton
parent 6e3426855d
commit 78d1c5222f
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/deskflow/App.cpp
View file

@ -195,7 +195,7 @@ void App::runEventsLoop(void *)
{ {
m_events->loop(); m_events->loop();
#if defined(MAC_OS_X_VERSION_10_7) #if WINAPI_CARBON
stopCocoaLoop(); stopCocoaLoop();

9
src/lib/deskflow/ClientApp.cpp
View file

@ -44,6 +44,8 @@
#endif #endif
#if WINAPI_CARBON #if WINAPI_CARBON
#include "base/TMethodJob.h"
#include "mt/Thread.h"
#include "platform/OSXDragSimulator.h" #include "platform/OSXDragSimulator.h"
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
#endif #endif
@ -52,11 +54,6 @@
#include "platform/Wayland.h" #include "platform/Wayland.h"
#endif #endif
#if defined(MAC_OS_X_VERSION_10_7)
#include "base/TMethodJob.h"
#include "mt/Thread.h"
#endif
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>
@ -455,7 +452,7 @@ int ClientApp::mainLoop()
// that. // that.
DAEMON_RUNNING(true); DAEMON_RUNNING(true);
#if defined(MAC_OS_X_VERSION_10_7) #if WINAPI_CARBON
Thread thread(new TMethodJob<ClientApp>(this, &ClientApp::runEventsLoop, NULL)); Thread thread(new TMethodJob<ClientApp>(this, &ClientApp::runEventsLoop, NULL));

9
src/lib/deskflow/ServerApp.cpp
View file

@ -47,6 +47,8 @@
#endif #endif
#if WINAPI_CARBON #if WINAPI_CARBON
#include "base/TMethodJob.h"
#include "mt/Thread.h"
#include "platform/OSXDragSimulator.h" #include "platform/OSXDragSimulator.h"
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
#endif #endif
@ -55,11 +57,6 @@
#include "platform/Wayland.h" #include "platform/Wayland.h"
#endif #endif
#if defined(MAC_OS_X_VERSION_10_7)
#include "base/TMethodJob.h"
#include "mt/Thread.h"
#endif
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -683,7 +680,7 @@ int ServerApp::mainLoop()
// that. // that.
DAEMON_RUNNING(true); DAEMON_RUNNING(true);
#if defined(MAC_OS_X_VERSION_10_7) #if WINAPI_CARBON
Thread thread(new TMethodJob<ServerApp>(this, &ServerApp::runEventsLoop, NULL)); Thread thread(new TMethodJob<ServerApp>(this, &ServerApp::runEventsLoop, NULL));