Fixes for building wxOS2 shared with OpenWatcom.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/os2/dataobj.h

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

include/wx/os2/dataobj2.h

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

include/wx/os2/private.h

@@ -388,7 +388,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)
@@ -423,4 +423,4 @@ WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
 
 #endif // __WXPM__
 
-#endif // _WX_PRIVATE_H_
+#endif // _WX_OS2_PRIVATE_H_

src/os2/utils.cpp

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