do #undef CreateDialog() under CE, what was the reason for not doing it?

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

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index da91ed7d0e3957522ac96343bc53984c4a0157c2..f85b33baccdc757406773296b1872a2eaf15d736 100644 (file)
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UXTHEME_H_
 #define _WX_UXTHEME_H_
 
 #ifndef _WX_UXTHEME_H_
 #define _WX_UXTHEME_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma interface "uxtheme.h"
 #endif
 
   #pragma interface "uxtheme.h"
 #endif
 


@@ -310,10 +310,6 @@ public:
     wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEPARENTBACKGROUND, DrawThemeParentBackground)
     wxUX_THEME_DECLARE(PFNWXUENABLETHEMING, EnableTheming)
 
     wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEPARENTBACKGROUND, DrawThemeParentBackground)
     wxUX_THEME_DECLARE(PFNWXUENABLETHEMING, EnableTheming)
 

-    // This calls IsAppThemed but also checks the commctrl.dll version
-    // for a more reliable answer.
-    bool IsAppThemedEx() ;
-

 private:
     // construcor is private as only Get() can create us and is also trivial as
     // everything really happens in Initialize()
 private:
     // construcor is private as only Get() can create us and is also trivial as
     // everything really happens in Initialize()


@@ -344,7 +340,7 @@ private:
     friend class wxUxThemeModule;
 #endif // wxUSE_UXTHEME
 
     friend class wxUxThemeModule;
 #endif // wxUSE_UXTHEME
 

-    DECLARE_NO_COPY_CLASS(wxUxThemeEngine);
+    DECLARE_NO_COPY_CLASS(wxUxThemeEngine)

 };
 
 #if !wxUSE_UXTHEME
 };
 
 #if !wxUSE_UXTHEME