X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a7f306263595bff3b74e96e4c2bee6f0a008500..bf57d1adacf489fb1a9a2167b909b279cdf3e0f6:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 5154c388ab..422f97d30a 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -805,7 +805,7 @@ enum wxStretch #else // Under Unix, the dialogs don't have a system menu. Specifying // wxSYSTEM_MENU here, will make a close button appear. -# define wxDEFAULT_DIALOG_STYLE (wxCAPTION) +# define wxDEFAULT_DIALOG_STYLE (wxCAPTION|wxTHICK_FRAME) #endif /* @@ -1024,6 +1024,11 @@ enum wxStretch */ #define wxST_SIZEGRIP 0x0010 +/* + * wxStaticText flags + */ +#define wxST_NO_AUTORESIZE 0x0001 + /* * wxStaticLine flags */ @@ -1560,7 +1565,7 @@ typedef long WXLPARAM; # define LOGFONT FATTRS # define LOWORD SHORT1FROMMP # define HIWORD SHORT2FROMMP -#endif +#endif // __WXMSW__ typedef unsigned long WXCOLORREF; typedef void * WXRGNDATA; typedef void * WXMSG; @@ -1578,6 +1583,7 @@ typedef unsigned long WXMSGID; typedef void* WXRESULT; typedef int (*WXFARPROC)(); // some windows handles not defined by PM +typedef unsigned long COLORREF; typedef unsigned long HANDLE; typedef unsigned long HICON; typedef unsigned long HFONT; @@ -1602,6 +1608,16 @@ typedef unsigned short WORD; #endif typedef WXHWND WXWidget; + +#if defined(__BORLANDC__) && !defined(__WIN32__) +#ifndef LPTSTR +#define LPTSTR LPSTR +#endif +#ifndef LPCTSTR +#define LPCTSTR LPSTR +#endif +#endif + #endif // MSW #ifdef __WXMOTIF__