X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38bb138f09688c1575766aafdbf296dfeeee0d7d..8fef2a9b08766582f18a87f675ad574eba58e640:/include/wx/apptrait.h diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index f6750d2bc4..1f3e30f3b7 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -24,7 +24,10 @@ class WXDLLIMPEXP_BASE wxMessageOutput; class WXDLLEXPORT wxRendererNative; class WXDLLIMPEXP_BASE wxString; -extern "C" struct GSocketGUIFunctionsTable; +extern "C" +{ + struct GSocketGUIFunctionsTable; +} // ---------------------------------------------------------------------------- // toolkit information @@ -131,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" @@ -212,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_