diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-17 00:20:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-18 07:41:32 +0200 |
| commit | 2a4af0e257baa3e559003c29cade5b594adef5e2 (patch) | |
| tree | d0ec13460582450944a5fcf757d050d3efc0645e /vcl | |
| parent | e0c2dd693c012bba30feb4c1dd0c5b424b135e3e (diff) | |
Bypass X11-specific code if not on X11
Change-Id: I6452191b11b197b0f90ae6638019d3bc6db67ad7
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/app/gensys.cxx | 8 | ||||
| -rw-r--r-- | vcl/inc/generic/gensys.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx index 6144f37d7f24..b24cfa201f7c 100644 --- a/vcl/generic/app/gensys.cxx +++ b/vcl/generic/app/gensys.cxx @@ -146,9 +146,9 @@ int SalGenericSystem::ShowNativeMessageBox( const OUString& rTitle, const OUStri return nResult != -1 ? nButtonIds[ nResult ] : 0; } -// ------------------------------------------------------------------------ -// Helpers primarily for X Windowing derivatives -// ------------------------------------------------------------------------ +#if !defined(ANDROID) && !defined(IOS) + +// X11-specific const char* SalGenericSystem::getFrameResName() { @@ -213,4 +213,6 @@ OString SalGenericSystem::getFrameResName( SalExtStyle nStyle ) return aBuf.makeStringAndClear(); } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index b055f11bbf4b..d51f222a4855 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -43,10 +43,12 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem int nButtonCombination, int nDefaultButton, bool bUseResources); - // simple helpers primarily for X Windowing W_CLASS hints +#if !defined(ANDROID) && !defined(IOS) + // Simple helpers for X11 WM_CLASS hints static const char *getFrameResName(); static const char *getFrameClassName(); static rtl::OString getFrameResName( SalExtStyle nStyle ); +#endif }; #endif // _SV_GENSYS_H |