Add a missing structure definition, move all rich text missing
stuff to wx/msw/missing.h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9795182e4a
commit
3ec4107dfc
@ -240,6 +240,86 @@ struct HH_AKLINK
|
||||
BOOL fIndexOnFail;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Rich text control
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_RICHEDIT && defined(MAX_TAB_STOPS)
|
||||
|
||||
// old mingw32 doesn't define this
|
||||
#ifndef CFM_CHARSET
|
||||
#define CFM_CHARSET 0x08000000
|
||||
#endif // CFM_CHARSET
|
||||
|
||||
#ifndef CFM_BACKCOLOR
|
||||
#define CFM_BACKCOLOR 0x04000000
|
||||
#endif
|
||||
|
||||
// cygwin does not have these defined for richedit
|
||||
#ifndef ENM_LINK
|
||||
#define ENM_LINK 0x04000000
|
||||
#endif
|
||||
|
||||
#ifndef EM_AUTOURLDETECT
|
||||
#define EM_AUTOURLDETECT (WM_USER + 91)
|
||||
#endif
|
||||
|
||||
#ifndef EN_LINK
|
||||
#define EN_LINK 0x070b
|
||||
|
||||
typedef struct _enlink
|
||||
{
|
||||
NMHDR nmhdr;
|
||||
UINT msg;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
CHARRANGE chrg;
|
||||
} ENLINK;
|
||||
#endif // ENLINK
|
||||
|
||||
#ifndef SF_UNICODE
|
||||
#define SF_UNICODE 0x0010
|
||||
#endif
|
||||
|
||||
// Watcom C++ doesn't define this
|
||||
#ifndef SCF_ALL
|
||||
#define SCF_ALL 0x0004
|
||||
#endif
|
||||
|
||||
#ifndef PFA_JUSTIFY
|
||||
#define PFA_JUSTIFY 4
|
||||
|
||||
typedef struct _paraformat2 {
|
||||
UINT cbSize;
|
||||
DWORD dwMask;
|
||||
WORD wNumbering;
|
||||
WORD wEffects;
|
||||
LONG dxStartIndent;
|
||||
LONG dxRightIndent;
|
||||
LONG dxOffset;
|
||||
WORD wAlignment;
|
||||
SHORT cTabCount;
|
||||
LONG rgxTabs[MAX_TAB_STOPS];
|
||||
LONG dySpaceBefore;
|
||||
LONG dySpaceAfter;
|
||||
LONG dyLineSpacing;
|
||||
SHORT sStype;
|
||||
BYTE bLineSpacingRule;
|
||||
BYTE bOutlineLevel;
|
||||
WORD wShadingWeight;
|
||||
WORD wShadingStyle;
|
||||
WORD wNumberingStart;
|
||||
WORD wNumberingStyle;
|
||||
WORD wNumberingTab;
|
||||
WORD wBorderSpace;
|
||||
WORD wBorderWidth;
|
||||
WORD wBorders;
|
||||
} PARAFORMAT2;
|
||||
#define wxEffects wReserved
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Misc stuff
|
||||
|
@ -65,45 +65,7 @@
|
||||
#include <richedit.h>
|
||||
#endif
|
||||
|
||||
// old mingw32 doesn't define this
|
||||
#ifndef CFM_CHARSET
|
||||
#define CFM_CHARSET 0x08000000
|
||||
#endif // CFM_CHARSET
|
||||
|
||||
#ifndef CFM_BACKCOLOR
|
||||
#define CFM_BACKCOLOR 0x04000000
|
||||
#endif
|
||||
|
||||
// cygwin does not have these defined for richedit
|
||||
#ifndef ENM_LINK
|
||||
#define ENM_LINK 0x04000000
|
||||
#endif
|
||||
|
||||
#ifndef EM_AUTOURLDETECT
|
||||
#define EM_AUTOURLDETECT (WM_USER + 91)
|
||||
#endif
|
||||
|
||||
#ifndef EN_LINK
|
||||
#define EN_LINK 0x070b
|
||||
|
||||
typedef struct _enlink
|
||||
{
|
||||
NMHDR nmhdr;
|
||||
UINT msg;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
CHARRANGE chrg;
|
||||
} ENLINK;
|
||||
#endif // ENLINK
|
||||
|
||||
#ifndef SF_UNICODE
|
||||
#define SF_UNICODE 0x0010
|
||||
#endif
|
||||
|
||||
// Watcom C++ doesn't define this
|
||||
#ifndef SCF_ALL
|
||||
#define SCF_ALL 0x0004
|
||||
#endif
|
||||
#include "wx/msw/missing.h"
|
||||
|
||||
#endif // wxUSE_RICHEDIT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user