X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e1e6965118640381e57adc373e4817db470e927..7b44d740f5aab6d21b9938ca8b29cfcc8a73dc7e:/include/wx/os2/private.h?ds=sidebyside diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index c2f24820dd..a453f8b02d 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: private.h +// Name: wx/os2/private.h // Purpose: Private declarations: as this header is only included by // wxWidgets itself, it may contain identifiers which don't start // with "wx". @@ -19,9 +19,47 @@ #define INCL_GPI #define INCL_WINSYS #define INCL_SHLERRORS +#define INCL_GPIERRORS #define INCL_DOS +#define INCL_WINATOM +#define INCL_WIN #include +#if wxONLY_WATCOM_EARLIER_THAN(1,4) + inline HATOMTBL APIENTRY WinQuerySystemAtomTable(VOID){return NULL;} + inline ULONG APIENTRY WinQueryAtomName(HATOMTBL,ATOM,PCSZ,ULONG){return 0;} + inline LONG APIENTRY GpiPointArc(HPS,PPOINTL){return GPI_ERROR;} + inline BOOL APIENTRY WinDrawPointer(HPS,LONG,LONG,HPOINTER,ULONG){return FALSE;} + inline HPOINTER APIENTRY WinCreatePointerIndirect(HWND,PPOINTERINFO){return NULLHANDLE;} + inline BOOL APIENTRY WinGetMaxPosition(HWND,PSWP){return FALSE;} + inline BOOL APIENTRY WinGetMinPosition(HWND,PSWP,PPOINTL){return FALSE;} +#endif + +#if defined(__WATCOMC__) && defined(__WXMOTIF__) + #include + #define I_NEED_OS2_H + #include + + // include this header from here for many of the GUI related code + #if wxUSE_GUI + extern "C" { + #include + } + #endif + + // provide Unix-like pipe() + #include + #include + #include + // Use ::DosCreatePipe or ::DosCreateNPipe under OS/2 + // for more see http://posix2.sourceforge.net/guide.html + inline int pipe( int WXUNUSED(filedes)[2] ) + { + wxFAIL_MSG(wxT("Implement first")); + return -1; + } +#endif + #if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA) typedef struct _SPBCDATA { @@ -37,11 +75,12 @@ #endif +#include "wx/dlimpexp.h" #include "wx/fontenc.h" class WXDLLEXPORT wxFont; class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_BASE wxString; class WXDLLEXPORT wxBitmap; // --------------------------------------------------------------------------- @@ -55,42 +94,35 @@ class WXDLLEXPORT wxBitmap; // // Controls // -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxBitmapRadioButtonNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; +WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxListBoxNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStaticTextNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxPanelNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxRadioBoxNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxRadioButtonNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxGetTextFromUserPromptStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorDefaultWildcardStr[]; WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; +WXDLLEXPORT_DATA(extern const wxChar) wxTreeCtrlNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogDefaultFolderStr[]; // // Class names @@ -131,16 +163,6 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM); #define CASTWNDPROC (WndProcCast) -#if wxUSE_ITSY_BITSY - #define IBS_HORZCAPTION 0x4000L - #define IBS_VERTCAPTION 0x8000L - - UINT APIENTRY ibGetCaptionSize( HWND hWnd ) ; - UINT APIENTRY ibSetCaptionSize( HWND hWnd, UINT nSize ) ; - MRESULT APIENTRY ibDefWindowProc( HWND hWnd, ULONG ulMsg, MPARAM wParam, MPARAM lParam ) ; - VOID APIENTRY ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ; -#endif // wxUSE_ITSY_BITSY - /* * Decide what window classes we're going to use * for this combination of CTl3D/FAFA settings @@ -265,26 +287,31 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message // OS/2 convention of the mask is opposed to the wxWidgets one, so we need // to invert the mask each time we pass one/get one to/from Windows extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); +extern HBITMAP wxFlipBmp(HBITMAP hbmp, int w = 0, int h = 0); // --------------------------------------------------------------------------- // global data // --------------------------------------------------------------------------- +#ifdef __WXPM__ // The MakeProcInstance version of the function wxSubclassedGenericControlProc WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; +#endif // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- +#ifdef __WXPM__ extern "C" { WXDLLEXPORT HINSTANCE wxGetInstance(); } WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); +#endif #include "wx/thread.h" static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid, @@ -355,7 +382,7 @@ WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd); WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd); // Convert a PM Error code to a string -WXDLLEXPORT extern wxString wxPMErrorToStr(ERRORID vError); +WXDLLIMPEXP_BASE extern wxString wxPMErrorToStr(ERRORID vError); // Does this window style specify any border? inline bool wxStyleHasBorder(long style) @@ -390,4 +417,4 @@ WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor); #endif // __WXPM__ -#endif // _WX_PRIVATE_H_ +#endif // _WX_OS2_PRIVATE_H_