#define INCL_WINSYS
#define INCL_SHLERRORS
#include <os2.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. */
+ LONG lLowerLimit; /* Spin lower limit (numeric only). */
+ LONG lUpperLimit; /* Spin upper limit (numeric only). */
+ ULONG idMasterSpb; /* ID of the servant's master spinbutton. */
+ PVOID pHWXCtlData; /* Handwriting control data structure flag. */
+ } SPBCDATA;
+
+ typedef SPBCDATA *PSPBCDATA;
+#endif
#include "wx/fontenc.h"
class WXDLLEXPORT wxFont;
class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxString;
+class WXDLLEXPORT wxBitmap;
// ---------------------------------------------------------------------------
// private constants
// standard icons from the resources
// ---------------------------------------------------------------------------
+#ifdef __WXPM__
+
WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
+#endif
+
// ---------------------------------------------------------------------------
// this defines a CASTWNDPROC macro which casts a pointer to the type of a
// window proc for PM.
// Scale font to get edit control height
#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2)
+#ifdef __WXPM__
+
// Generic subclass proc, for panel item moving/sizing and intercept
// EDIT control VK_RETURN messages
extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message, WXWPARAM wParam, WXLPARAM lParam);
+#endif
+
// ---------------------------------------------------------------------------
// constants which might miss from some compilers' headers
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// The MakeProcInstance version of the function wxSubclassedGenericControlProc
-WXDLLEXPORT_DATA(extern) wxGenericControlSubClassProc;
+WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
WXDLLEXPORT HINSTANCE wxGetInstance();
}
+WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
+
+#include "wx/thread.h"
+static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid,
+ MPARAM mpParam1, MPARAM mpParam2)
+{
+ MRESULT vRes;
+ vRes = ::WinSendMsg(hwnd, ulMsgid, mpParam1, mpParam2);
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ ::WinPostMsg(hwnd, ulMsgid, mpParam1, mpParam2);
+#endif
+ return vRes;
+}
+#define WinSendMsg MySendMsg
+
+#ifdef __WXPM__
+
WXDLLEXPORT void wxDrawBorder( HPS hPS
,RECTL& rRect
,WXDWORD dwStyle
);
-WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
-
WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
+
+WXDLLEXPORT void wxConvertVectorFontSize( FIXED fxPointSize
+ ,PFATTRS pFattrs
+ );
WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont
,PFACENAMEDESC pFaceName
- ,HPS hPS
+ ,HPS* phPS
+ ,bool* pbInternalPS
,long* pflId
,wxString& sFaceName
,wxFont* pFont
);
-WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd
- ,WXFARPROC fnWndProc
+WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd
+ ,WXFARPROC fnWndProc
);
+WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
+ ,long lColor
+ );
-#endif
- // _WX_PRIVATE_H_
+#include "wx/colour.h"
+
+WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+
+#endif // __WXPM__
+
+#endif // _WX_PRIVATE_H_