forked from Mirrors/openclonk
win32: Replace most BOOL usages
The callbacks apparently changed for 64 bit support, and RegisterWindowClass is just a simple C++ function. Unfortunately, there's one callback left.
parent
d6778782be
commit
aa0cef3a8d
|
@ -32,7 +32,7 @@ C4ComponentHost *pCmpHost=NULL;
|
|||
#ifdef _WIN32
|
||||
#include "resource.h"
|
||||
|
||||
BOOL CALLBACK ComponentDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK ComponentDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (!pCmpHost) return false;
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ protected:
|
|||
#ifdef _WIN32
|
||||
HWND hDialog;
|
||||
void InitDialog(HWND hDlg);
|
||||
friend BOOL CALLBACK ComponentDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
friend INT_PTR CALLBACK ComponentDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ protected:
|
|||
int MenuIndexHelp;
|
||||
#ifdef _WIN32
|
||||
void UpdateMenuText(HMENU hMenu);
|
||||
BOOL RegisterConsoleWindowClass(HINSTANCE hInst);
|
||||
bool RegisterConsoleWindowClass(HINSTANCE hInst);
|
||||
bool AddMenuItem(HMENU hMenu, DWORD dwID, const char *szString, bool fEnabled=true);
|
||||
virtual bool Win32DialogMessageHandling(MSG * msg)
|
||||
{
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#ifdef _WIN32
|
||||
#include "resource.h"
|
||||
|
||||
BOOL CALLBACK PropertyDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK PropertyDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (Msg)
|
||||
{
|
||||
|
|
|
@ -46,7 +46,7 @@ public:
|
|||
bool Active;
|
||||
#ifdef _WIN32
|
||||
HWND hDialog;
|
||||
friend BOOL CALLBACK PropertyDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
friend INT_PTR CALLBACK PropertyDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
#else
|
||||
#ifdef WITH_DEVELOPER_MODE
|
||||
// GtkWidget* window;
|
||||
|
|
|
@ -105,7 +105,7 @@ namespace
|
|||
|
||||
#ifdef _WIN32
|
||||
#include <commctrl.h>
|
||||
BOOL CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
int32_t iValue;
|
||||
switch (Msg)
|
||||
|
|
|
@ -45,7 +45,7 @@ const int32_t C4TLS_GradeMax = 50,
|
|||
class C4ToolsDlg
|
||||
{
|
||||
#ifdef _WIN32
|
||||
friend BOOL CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
friend INT_PTR CALLBACK ToolsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
#endif
|
||||
public:
|
||||
C4ToolsDlg();
|
||||
|
|
|
@ -60,7 +60,7 @@ CStdWindow::~CStdWindow ()
|
|||
{
|
||||
}
|
||||
|
||||
BOOL CStdWindow::RegisterWindowClass(HINSTANCE hInst)
|
||||
bool CStdWindow::RegisterWindowClass(HINSTANCE hInst)
|
||||
{
|
||||
WNDCLASSEXW WndClass = {0};
|
||||
WndClass.cbSize = sizeof(WNDCLASSEX);
|
||||
|
@ -287,7 +287,7 @@ bool CStdApp::FlushMessages()
|
|||
|
||||
int GLMonitorInfoEnumCount;
|
||||
|
||||
BOOL CALLBACK GLMonitorInfoEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
|
||||
static BOOL CALLBACK GLMonitorInfoEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
|
||||
{
|
||||
// get to indexed monitor
|
||||
if (GLMonitorInfoEnumCount--) return true;
|
||||
|
|
|
@ -266,7 +266,7 @@ protected:
|
|||
public:
|
||||
HWND hWindow;
|
||||
protected:
|
||||
BOOL RegisterWindowClass(HINSTANCE hInst);
|
||||
bool RegisterWindowClass(HINSTANCE hInst);
|
||||
virtual bool Win32DialogMessageHandling(MSG * msg) { return false; };
|
||||
#elif defined(USE_X11)
|
||||
protected:
|
||||
|
|
Loading…
Reference in New Issue