</set>
<set var="BASE_OS2_SRC" hints="files">
- src/unix/baseunix.cpp
src/os2/dir.cpp
src/os2/mimetype.cpp
src/os2/thread.cpp
// Unix code (and otherwise __UNIX__ wouldn't be defined)
#if defined(__WXMSW__)
#include "wx/msw/apptbase.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
#include "wx/unix/apptbase.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptbase.h"
#if defined(__WXMSW__)
#include "wx/msw/apptrait.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
#include "wx/unix/apptrait.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptrait.h"
-#else // no platform-specific methods to add to wxAppTraits
+#else
+ // at least, we need an implementation of GetToolkitInfo !
#if wxUSE_GUI
- typedef wxGUIAppTraitsBase wxGUIAppTraits;
+ class wxGUIAppTraits : public wxGUIAppTraitsBase
+ {
+ virtual wxToolkitInfo& GetToolkitInfo();
+ };
#endif // wxUSE_GUI
- typedef wxConsoleAppTraitsBase wxConsoleAppTraits;
+ class wxConsoleAppTraits: public wxConsoleAppTraitsBase
+ {
+ virtual wxToolkitInfo& GetToolkitInfo();
+ };
#endif // platform
#endif // _WX_APPTRAIT_H_
{
DosBeep(1000,1000); // 1kHz during 1 sec.
}
-#if 0
-int wxGUIAppTraits::GetOSVersion(
- int* pMajorVsn
-, int* pMinorVsn
-)
+
+wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
{
+ static wxToolkitInfo vInfo;
ULONG ulSysInfo[QSV_MAX] = {0};
APIRET ulrc;
+ vInfo.name = _T("wxBase");
ulrc = ::DosQuerySysInfo( 1L
,QSV_MAX
,(PVOID)ulSysInfo
);
if (ulrc == 0L)
{
- *pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR];
- *pMajorVsn = *pMajorVsn/10;
- *pMinorVsn = ulSysInfo[QSV_VERSION_MINOR];
- return wxWINDOWS_OS2;
+ vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10;
+ vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR];
}
- return wxWINDOWS; // error if we get here, return generic value
+ vInfo.os = wxOS2_PM;
+ return vInfo;
}
-#endif
+
// ---------------------------------------------------------------------------
const wxChar* wxGetHomeDir(
wxString* pStr
}
return(sError);
} // end of wxPMErrorToStr
+
+// replacement for implementation in unix/utilsunx.cpp,
+// to be used by all X11 based ports.
+struct wxEndProcessData;
+
+void wxHandleProcessTermination(wxEndProcessData *proc_data)
+{
+ // For now, just do nothing. To be filled in as needed.
+}
wxDisplaySize(width, height);
}
+wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo()
+{
+ static wxToolkitInfo vInfo;
+ ULONG ulSysInfo[QSV_MAX] = {0};
+ APIRET ulrc;
+
+ vInfo.shortName = _T("PM");
+ vInfo.name = _T("wxOS2");
+#ifdef __WXUNIVERSAL__
+ vInfo.shortName << _T("univ");
+ vInfo.name << _T("/wxUniversal");
+#endif
+ ulrc = ::DosQuerySysInfo( 1L
+ ,QSV_MAX
+ ,(PVOID)ulSysInfo
+ ,sizeof(ULONG) * QSV_MAX
+ );
+ if (ulrc == 0L)
+ {
+ vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10;
+ vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR];
+ }
+ vInfo.os = wxOS2_PM;
+ return vInfo;
+}
+
// ---------------------------------------------------------------------------
// window information functions
// ---------------------------------------------------------------------------