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

Fixed AppTraits handling on OS/2.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-08-31 18:15:10 +00:00
parent 3c589c7f47
commit 621ccd8a82
4 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/apptrait.h
View File

@@ -134,7 +134,7 @@ public:
// 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"
@@ -215,15 +215,22 @@ public:
#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_