Keep displayed month and year in sync in wxGenericCalendarCtrl.

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

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index 378a26ed98abb19221d911f615c6b44b759ca046..aa03f8522e7f42bdbfa3186c604890f7a450c312 100644 (file)
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/msw/uxtheme.h
+// Name:        wx/msw/uxtheme.h

 // Purpose:     wxUxThemeEngine class: support for XP themes
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin
 // Purpose:     wxUxThemeEngine class: support for XP themes
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UXTHEME_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UXTHEME_H_


@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#include "wx/msw/wrapwin.h"
+#include "wx/msw/private.h"     // we use GetHwndOf()

 #include "wx/msw/uxthemep.h"
 
 typedef HTHEME  (__stdcall *PFNWXUOPENTHEMEDATA)(HWND, const wchar_t *);
 #include "wx/msw/uxthemep.h"
 
 typedef HTHEME  (__stdcall *PFNWXUOPENTHEMEDATA)(HWND, const wchar_t *);


@@ -79,7 +79,7 @@ typedef HRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL);
     #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; }
 #endif
 
     #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; }
 #endif
 

-class WXDLLEXPORT wxUxThemeEngine
+class WXDLLIMPEXP_CORE wxUxThemeEngine

 {
 public:
     // get the theme engine or NULL if themes are not available
 {
 public:
     // get the theme engine or NULL if themes are not available


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

-    DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
+    wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine);

 };
 
 #if wxUSE_UXTHEME
 };
 
 #if wxUSE_UXTHEME


@@ -223,7 +223,7 @@ public:
 private:
     HTHEME m_hTheme;
 
 private:
     HTHEME m_hTheme;
 

-    DECLARE_NO_COPY_CLASS(wxUxThemeHandle)
+    wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle);

 };
 
 #endif // _WX_UXTHEME_H_
 };
 
 #endif // _WX_UXTHEME_H_