#define INCL_WINSYS
#define INCL_SHLERRORS
#include <os2.h>
-#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS)
-/* struct missing in "os2emx.h" */
+#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(FCF_CLOSEBUTTON)
+/* struct missing in "os2emx.h" - luckily FCF_CLOSEBUTTON was added in the
+ same version of os2emx.h as SPBCDATA type, so we can do the test above. */
typedef struct _SPBCDATA {
ULONG cbSize; /* Size of control block. */
ULONG ulTextLimit; /* Entryfield text limit. */
// standard icons from the resources
// ---------------------------------------------------------------------------
-#if wxUSE_GUI
+#ifdef __WXPM__
WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
-#endif // wxUSE_GUI
+#endif
// ---------------------------------------------------------------------------
// this defines a CASTWNDPROC macro which casts a pointer to the type of a
// Scale font to get edit control height
#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2)
-#if wxUSE_GUI
+#ifdef __WXPM__
// Generic subclass proc, for panel item moving/sizing and intercept
// EDIT control VK_RETURN messages
}
#define WinSendMsg MySendMsg
-#if wxUSE_GUI
+#ifdef __WXPM__
WXDLLEXPORT void wxDrawBorder( HPS hPS
,RECTL& rRect
WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
-#endif // wxUSE_GUI
+#endif // __WXPM__
#endif // _WX_PRIVATE_H_