mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Remove global Windows.h include
This is the beginning of efforts to reduce the scope of Windows.h. I have shuttled it into hsWindows.h (again) and fixed the compilation of the major apps. There is still some scope work that needs to be done, and the Max plugin has not yet been addressed.
This commit is contained in:
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "plProfileManager.h"
|
||||
#include "plProfile.h"
|
||||
#include "hsTimer.h"
|
||||
|
||||
#include "hsWindows.h"
|
||||
|
||||
|
||||
static uint32_t gCyclesPerMS = 0;
|
||||
|
@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#ifndef plKeyDef_inc
|
||||
#define plKeyDef_inc
|
||||
|
||||
#include "HeadSpin.h"
|
||||
|
||||
#if HS_BUILD_FOR_WIN32
|
||||
|
||||
#include "hsWindows.h" // FIXME: This gives me a sad.
|
||||
|
||||
#define VK_BACK_QUOTE 0xc0
|
||||
// MinGW is missing these definitions:
|
||||
#ifndef VK_OEM_PLUS
|
||||
|
@ -53,6 +53,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
// for Win32:
|
||||
#ifdef HS_BUILD_FOR_WIN32
|
||||
|
||||
#include "hsWindows.h" // FIXME: This gives me a sad
|
||||
|
||||
enum plOSMsg
|
||||
{
|
||||
KEYDOWN = WM_KEYDOWN,
|
||||
|
@ -116,9 +116,19 @@ protected:
|
||||
plMessage *fMsg;
|
||||
|
||||
public:
|
||||
plMessage *GetMessage() { return fMsg; }
|
||||
void SetMessage(plMessage *msg) { fMsg = msg; hsRefCnt_SafeRef(msg); }
|
||||
void SendMessage() { fMsg->SendAndKeep(); }
|
||||
plMessage* GetMessageNoRef() const { return fMsg; }
|
||||
void SetMessageRef(plMessage *msg)
|
||||
{
|
||||
hsRefCnt_SafeUnRef(fMsg);
|
||||
hsRefCnt_SafeRef(msg);
|
||||
fMsg = msg;
|
||||
}
|
||||
|
||||
void SendMessageAndKeep()
|
||||
{
|
||||
if (fMsg)
|
||||
fMsg->SendAndKeep();
|
||||
}
|
||||
|
||||
plEventCallbackInterceptMsg() : plEventCallbackMsg(), fMsg(nil) {}
|
||||
~plEventCallbackInterceptMsg() { hsRefCnt_SafeUnRef(fMsg); fMsg = nil; }
|
||||
|
@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#define plNetAddress_h_inc
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include "hsWindows.h" // FIXME
|
||||
#include "plString.h"
|
||||
|
||||
#include "hsStlUtils.h"
|
||||
|
@ -40,6 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
*==LICENSE==*/
|
||||
#include "pnNetCommon.h"
|
||||
#include "hsWindows.h"
|
||||
|
||||
#if HS_BUILD_FOR_UNIX
|
||||
# include <sys/socket.h>
|
||||
|
@ -42,13 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#ifndef pnNetCommon_h_inc
|
||||
#define pnNetCommon_h_inc
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include "plString.h"
|
||||
#include "hsStlUtils.h"
|
||||
#include "hsRefCnt.h"
|
||||
#include "hsStream.h"
|
||||
#include "pnFactory/plCreatable.h"
|
||||
|
||||
class plString;
|
||||
|
||||
//
|
||||
// main logging switch
|
||||
//
|
||||
|
@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
*==LICENSE==*/
|
||||
#include "hsTimer.h"
|
||||
#include "HeadSpin.h"
|
||||
#include "hsWindows.h"
|
||||
|
||||
#include "plTweak.h"
|
||||
|
||||
|
@ -52,6 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include "hsWindows.h"
|
||||
#include "pnTimer/pnBuildDates.h"
|
||||
|
||||
char pnBuildDates::fBuildDate[ 128 ] = __DATE__;
|
||||
|
Reference in New Issue
Block a user