make clangd happy with introducing BaseTypes.h

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@532 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-31 20:23:09 +00:00
parent b1abe76aeb
commit 1f380b8c3c
2 changed files with 64 additions and 53 deletions

61
include/Mw/BaseTypes.h Normal file
View File

@@ -0,0 +1,61 @@
/* $Id$ */
/*!
* @file Mw/BaseTypes.h
* @brief Base type definitions
*/
#ifndef __MW_BASETYPES_H__
#define __MW_BASETYPES_H__
typedef struct _MwPoint MwPoint;
typedef struct _MwRect MwRect;
typedef struct _MwSizeHints MwSizeHints;
typedef struct _MwFont MwFont;
typedef struct _MwCursor MwCursor;
typedef unsigned char MwBool;
#define MwTRUE ((MwBool)1)
#define MwFALSE ((MwBool)0)
#if __STDC_VERSION__ >= 199901L || __GNUC__ > 2
typedef long long MwOffset;
#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
typedef __int64 MwOffset;
#else
typedef long MwOffset; /* out of hope */
#endif
struct _MwPoint {
int x;
int y;
};
struct _MwRect {
int x;
int y;
unsigned int width;
unsigned int height;
};
struct _MwSizeHints {
int min_width;
int min_height;
int max_width;
int max_height;
};
#define MwCursorDataHeight 16
struct _MwCursor {
int width;
int height;
int x;
int y;
unsigned int data[MwCursorDataHeight];
};
struct _MwFont {
int left;
int top;
unsigned char data[16];
};
#endif

View File

@@ -7,22 +7,18 @@
#define __MW_TYPEDEFS_H__
#include <Mw/MachDep.h>
#include <Mw/BaseTypes.h>
typedef struct _MwClass * MwClass, MwClassRec;
typedef struct _MwPoint MwPoint;
typedef struct _MwRect MwRect;
typedef struct _MwIntegerKeyValue MwIntegerKeyValue;
typedef struct _MwTextKeyValue MwTextKeyValue;
typedef struct _MwUserHandlerKeyValue MwUserHandlerKeyValue;
typedef struct _MwVoidKeyValue MwVoidKeyValue;
typedef struct _MwFont MwFont;
typedef struct _MwCursor MwCursor;
typedef struct _MwMenu* MwMenu;
typedef struct _MwEntry* MwEntry;
typedef struct _MwViewport* MwViewport;
typedef struct _MwListBox* MwListBox;
typedef struct _MwListBoxEntry MwListBoxEntry;
typedef struct _MwSizeHints MwSizeHints;
typedef struct _MwDirectoryEntry MwDirectoryEntry;
typedef struct _MwListBoxPacket MwListBoxPacket;
#ifdef _MILSKO
@@ -39,32 +35,6 @@ typedef void (*MwUserHandler)(MwWidget handle, void* user_data, void* call_data)
typedef void (*MwErrorHandler)(int code, const char* message, void* user_data);
typedef void (*MwHandlerExecute)(MwWidget handle, const char* name, void* out, va_list args);
#if __STDC_VERSION__ >= 199901L || __GNUC__ > 2
typedef long long MwOffset;
#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
typedef __int64 MwOffset;
#else
typedef long MwOffset; /* out of hope */
#endif
typedef unsigned char MwBool;
#define MwTRUE ((MwBool)1)
#define MwFALSE ((MwBool)0)
#include <Mw/LowLevel.h>
struct _MwPoint {
int x;
int y;
};
struct _MwRect {
int x;
int y;
unsigned int width;
unsigned int height;
};
struct _MwTextKeyValue {
char* key;
char* value;
@@ -86,6 +56,8 @@ struct _MwVoidKeyValue {
void* value;
};
#include <Mw/LowLevel.h>
#ifdef _MILSKO
struct _MwWidget {
char* name;
@@ -154,13 +126,6 @@ struct _MwListBox {
int* width;
};
struct _MwSizeHints {
int min_width;
int min_height;
int max_width;
int max_height;
};
struct _MwDirectoryEntry {
char* name;
int type;
@@ -173,15 +138,6 @@ struct _MwListBoxPacket {
char*** names;
};
#define MwCursorDataHeight 16
struct _MwCursor {
int width;
int height;
int x;
int y;
unsigned int data[MwCursorDataHeight];
};
struct _MwClass {
MwHandlerWithStatus create;
MwHandler destroy;
@@ -200,10 +156,4 @@ struct _MwClass {
void* reserved5;
};
struct _MwFont {
int left;
int top;
unsigned char data[16];
};
#endif