From 764bb7f18ee8e301ad1d76ab892703b82116cd3a Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 23 Nov 2003 22:11:32 +0000 Subject: [PATCH] Try to insure usability of this file in non-PM ports. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/private.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index a4c05ef5d4..09738ef73f 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -120,6 +120,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR; // 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; @@ -128,6 +130,8 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_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. @@ -183,10 +187,14 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM); // 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 // --------------------------------------------------------------------------- @@ -247,6 +255,9 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); // The MakeProcInstance version of the function wxSubclassedGenericControlProc WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; + +#ifdef __WXPM__ + WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; // --------------------------------------------------------------------------- @@ -356,5 +367,7 @@ WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp ,long lColor ); +#endif // __WXPM__ + #endif // _WX_PRIVATE_H_