summaryrefslogtreecommitdiff
path: root/xfa/include
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/include')
-rw-r--r--xfa/include/fwl/basewidget/fwl_edit.h2
-rw-r--r--xfa/include/fwl/basewidget/fwl_listbox.h2
-rw-r--r--xfa/include/fwl/core/fwl_grid.h2
-rw-r--r--xfa/include/fwl/core/fwl_thread.h2
-rw-r--r--xfa/include/fwl/core/fwl_timer.h2
-rw-r--r--xfa/include/fxjse/fxjse.h17
6 files changed, 14 insertions, 13 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index 915f149c09..79a7a84230 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -110,7 +110,7 @@ class IFWL_EditDP : public IFWL_DataProvider {};
#define FWL_EDT_FIND_FLAGS_Next (1L << 0)
#define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1)
#define FWL_EDT_FIND_FLAGS_NoCase (1L << 2)
-typedef struct _FWL_HEDTFIND { void* pData; } * FWL_HEDTFIND;
+typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND;
class IFWL_Edit : public IFWL_Widget {
public:
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h
index 4945ebc57f..7645c2526b 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/include/fwl/basewidget/fwl_listbox.h
@@ -58,7 +58,7 @@ CFX_Matrix m_matrix;
int32_t m_index;
CFX_RectF m_rect;
END_FWL_EVENT_DEF
-typedef struct _FWL_HLISTITEM { void* pData; } * FWL_HLISTITEM;
+typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM;
struct FWL_ListBoxItemData {
IFWL_ListBoxDP* pDataProvider;
int32_t iIndex;
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index e7071af7b3..9e17e2c846 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -36,7 +36,7 @@ enum FWL_GRIDSIZE {
FWL_GRIDSIZE_MaxWidth,
FWL_GRIDSIZE_MaxHeight,
};
-typedef struct _FWL_HGRIDCOLROW { void* pData; } * FWL_HGRIDCOLROW;
+typedef struct FWL_HGRIDCOLROW_ { void* pData; } * FWL_HGRIDCOLROW;
class IFWL_Grid : public IFWL_Content {
public:
static IFWL_Grid* Create(const CFWL_WidgetImpProperties& properties);
diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index c10f72900c..d83c74f8c4 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -25,7 +25,7 @@
class CFWL_ThreadImp;
class IFWL_NoteDriver;
-typedef struct _FWL_HTHREAD { void* pData; } * FWL_HTHREAD;
+typedef struct FWL_HTHREAD_ { void* pData; } * FWL_HTHREAD;
class IFWL_Thread {
public:
diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h
index 27b2a48c5d..b9b4735f22 100644
--- a/xfa/include/fwl/core/fwl_timer.h
+++ b/xfa/include/fwl/core/fwl_timer.h
@@ -9,7 +9,7 @@
#include "core/include/fxcrt/fx_system.h"
-typedef struct _FWL_HTIMER { void* pData; } * FWL_HTIMER;
+typedef struct FWL_HTIMER_ { void* pData; } * FWL_HTIMER;
class IFWL_Timer {
public:
diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index b8a2af4b8a..fea885ac09 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -13,19 +13,20 @@
class CPDFDoc_Environment;
class CPDF_Page;
+struct FXJSE_CLASS;
typedef struct FXJSE_HRUNTIME_ { void* pData; } * FXJSE_HRUNTIME;
typedef struct FXJSE_HCONTEXT_ { void* pData; } * FXJSE_HCONTEXT;
typedef struct FXJSE_HCLASS_ { void* pData; } * FXJSE_HCLASS;
typedef struct FXJSE_HVALUE_ { void* pData; } * FXJSE_HVALUE;
typedef struct FXJSE_HOBJECT_ : public FXJSE_HVALUE_{} * FXJSE_HOBJECT;
-
typedef double FXJSE_DOUBLE;
+
void FXJSE_Initialize();
void FXJSE_Finalize();
FXJSE_HRUNTIME FXJSE_Runtime_Create();
void FXJSE_Runtime_Release(FXJSE_HRUNTIME hRuntime, bool bOwnedRuntime);
-typedef struct _FXJSE_CLASS FXJSE_CLASS;
+
FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime,
const FXJSE_CLASS* lpGlobalClass = nullptr,
void* lpGlobalObject = nullptr);
@@ -61,26 +62,26 @@ typedef int32_t (*FXJSE_PropTypeGetter)(FXJSE_HOBJECT hObject,
FX_BOOL bQueryIn);
typedef FX_BOOL (*FXJSE_PropDeleter)(FXJSE_HOBJECT hObject,
const CFX_ByteStringC& szPropName);
-typedef struct _FXJSE_FUNCTION {
+struct FXJSE_FUNCTION {
const FX_CHAR* name;
FXJSE_FuncCallback callbackProc;
-} FXJSE_FUNCTION;
+};
#define FXJSE_DEF_FUNCTION(functionName, functionCallback) \
{ functionName, functionCallback }
void FXJSE_DefineFunctions(FXJSE_HCONTEXT hContext,
const FXJSE_FUNCTION* lpFunctions,
int nNum);
-typedef struct _FXJSE_PROPERTY {
+struct FXJSE_PROPERTY {
const FX_CHAR* name;
FXJSE_PropAccessor getProc;
FXJSE_PropAccessor setProc;
-} FXJSE_PROPERTY;
+};
enum FXJSE_ClassPropTypes {
FXJSE_ClassPropType_None,
FXJSE_ClassPropType_Property,
FXJSE_ClassPropType_Method
};
-typedef struct _FXJSE_CLASS {
+struct FXJSE_CLASS {
const FX_CHAR* name;
FXJSE_FuncCallback constructor;
FXJSE_PROPERTY* properties;
@@ -92,7 +93,7 @@ typedef struct _FXJSE_CLASS {
FXJSE_PropAccessor dynPropSetter;
FXJSE_PropDeleter dynPropDeleter;
FXJSE_FuncCallback dynMethodCall;
-} FXJSE_CLASS;
+};
FXJSE_HCLASS FXJSE_DefineClass(FXJSE_HCONTEXT hContext,
const FXJSE_CLASS* lpClass);
FXJSE_HCLASS FXJSE_GetClass(FXJSE_HCONTEXT hContext,