Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for building wxOS2 shared with OpenWatcom.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-25 13:59:55 +00:00
parent 980ee83f63
commit 0e2a14e5e3
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/os2/dataobj.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: mac/dataobj.h // Name: wx/os2/dataobj.h
// Purpose: declaration of the wxDataObject // Purpose: declaration of the wxDataObject
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -9,14 +9,14 @@
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MAC_DATAOBJ_H_ #ifndef _WX_OS2_DATAOBJ_H_
#define _WX_MAC_DATAOBJ_H_ #define _WX_OS2_DATAOBJ_H_
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDataObject is the same as wxDataObjectBase under wxGTK // wxDataObject is the same as wxDataObjectBase under wxGTK
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxDataObject : public wxDataObjectBase class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
{ {
public: public:
wxDataObject(); wxDataObject();
@@ -36,5 +36,4 @@ private:
PDRAGITEM m_pDataObject; PDRAGITEM m_pDataObject;
}; };
#endif // _WX_MAC_DATAOBJ_H_ #endif // _WX_OS2_DATAOBJ_H_

11
include/wx/os2/dataobj2.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: mac/dataobj2.h // Name: wx/os2/dataobj2.h
// Purpose: declaration of standard wxDataObjectSimple-derived classes // Purpose: declaration of standard wxDataObjectSimple-derived classes
// Author: Stefan Csomor (adapted from Robert Roebling's gtk port // Author: Stefan Csomor (adapted from Robert Roebling's gtk port
// Modified by: // Modified by:
@@ -9,14 +9,14 @@
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MAC_DATAOBJ2_H_ #ifndef _WX_OS2_DATAOBJ2_H_
#define _WX_MAC_DATAOBJ2_H_ #define _WX_OS2_DATAOBJ2_H_
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBitmapDataObject is a specialization of wxDataObject for bitmaps // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxBitmapDataObject : public wxBitmapDataObjectBase class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
{ {
public: public:
// ctors // ctors
@@ -82,5 +82,4 @@ private:
{ return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); } { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
}; };
#endif // _WX_MAC_DATAOBJ2_H_ #endif // _WX_OS2_DATAOBJ2_H_

4
include/wx/os2/private.h
View File

@@ -388,7 +388,7 @@ WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd);
WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd); WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd);
// Convert a PM Error code to a string // 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? // Does this window style specify any border?
inline bool wxStyleHasBorder(long style) inline bool wxStyleHasBorder(long style)
@@ -423,4 +423,4 @@ WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
#endif // __WXPM__ #endif // __WXPM__
#endif // _WX_PRIVATE_H_ #endif // _WX_OS2_PRIVATE_H_

7
src/os2/utils.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: utils.cpp // Name: src/os2/utils.cpp
// Purpose: Various utilities // Purpose: Various utilities
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
@@ -13,7 +13,6 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
@@ -442,7 +441,7 @@ wxChar* wxGetUserHome ( const wxString &rUser )
return (wxChar*)wxEmptyString; // No home known! return (wxChar*)wxEmptyString; // No home known!
} }
wxString WXDLLEXPORT wxPMErrorToStr(ERRORID vError) wxString wxPMErrorToStr(ERRORID vError)
{ {
wxString sError; wxString sError;
@@ -495,7 +494,7 @@ wxString WXDLLEXPORT wxPMErrorToStr(ERRORID vError)
default: default:
sError = wxT("Unknown error"); sError = wxT("Unknown error");
} }
return(sError); return sError;
} // end of wxPMErrorToStr } // end of wxPMErrorToStr
// replacement for implementation in unix/utilsunx.cpp, // replacement for implementation in unix/utilsunx.cpp,