disable wxUSE_EXCEPTIONS when compiling with VC++ but without /GX (a.k.a. /EHsc)...

[wxWidgets.git] / include / wx / msw / uxtheme.h

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index f7578a97467c4c4bb2cac7e10edf9cc1c080b08f..13c77b2288cb4e3a1e81189b675a312dbbd9810f 100644 (file)
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -347,6 +347,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
 };
 
     DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
 };
 

+#if wxUSE_UXTHEME
+

 /* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive()
 {
     wxUxThemeEngine *engine = Get();
 /* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive()
 {
     wxUxThemeEngine *engine = Get();


@@ -355,7 +357,7 @@ private:
                 : NULL;
 }
 
                 : NULL;
 }
 

-#if !wxUSE_UXTHEME
+#else // !wxUSE_UXTHEME

 
 /* static */ inline wxUxThemeEngine *wxUxThemeEngine::Get()
 {
 
 /* static */ inline wxUxThemeEngine *wxUxThemeEngine::Get()
 {


@@ -367,7 +369,7 @@ private:
     return NULL;
 }
 
     return NULL;
 }
 

-#endif // !wxUSE_UXTHEME
+#endif // wxUSE_UXTHEME/!wxUSE_UXTHEME

 
 // ----------------------------------------------------------------------------
 // wxUxThemeHandle: encapsulates ::Open/CloseThemeData()
 
 // ----------------------------------------------------------------------------
 // wxUxThemeHandle: encapsulates ::Open/CloseThemeData()