X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbf618dff87a9e4a88d5be458cecc50309b30af3..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/private.h diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index d0773e6e6a..2dc0f10f7f 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -19,9 +19,22 @@ #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 @@ -65,10 +78,10 @@ #include "wx/dlimpexp.h" #include "wx/fontenc.h" -class WXDLLEXPORT wxFont; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxString; -class WXDLLEXPORT wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxFont; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_BASE wxString; +class WXDLLIMPEXP_FWD_CORE wxBitmap; // --------------------------------------------------------------------------- // private constants @@ -81,42 +94,36 @@ 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) wxStaticLineNameStr[]; +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 @@ -281,6 +288,7 @@ 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 wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0); // --------------------------------------------------------------------------- // global data @@ -375,7 +383,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) @@ -410,4 +418,4 @@ WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor); #endif // __WXPM__ -#endif // _WX_PRIVATE_H_ +#endif // _WX_OS2_PRIVATE_H_