X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52b90aa7abd254ce774fa00fa9843a11a3d359d4..d298f18ffb4bd0bd758b10f34c9e01cd119d1365:/include/wx/msw/subwin.h

diff --git a/include/wx/msw/subwin.h b/include/wx/msw/subwin.h
index 06ba1433e5..90be4841a1 100644
--- a/include/wx/msw/subwin.h
+++ b/include/wx/msw/subwin.h
@@ -18,7 +18,7 @@
 // wxSubwindows contains all HWNDs making part of a single wx control
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSubwindows
+class WXDLLIMPEXP_CORE wxSubwindows
 {
 public:
     // the number of subwindows can be specified either as parameter to ctor or
@@ -28,7 +28,7 @@ public:
     // allocate enough space for the given number of windows
     void Create(size_t n)
     {
-        wxASSERT_MSG( !m_hwnds, _T("Create() called twice?") );
+        wxASSERT_MSG( !m_hwnds, wxT("Create() called twice?") );
 
         m_count = n;
         m_hwnds = (HWND *)calloc(n, sizeof(HWND));
@@ -54,21 +54,21 @@ public:
     // access a given window
     HWND& Get(size_t n)
     {
-        wxASSERT_MSG( n < m_count, _T("subwindow index out of range") );
+        wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
 
         return m_hwnds[n];
     }
 
     HWND operator[](size_t n) const
     {
-        return wx_const_cast(wxSubwindows *, this)->Get(n);
+        return const_cast<wxSubwindows *>(this)->Get(n);
     }
 
     // initialize the given window: id will be stored in wxWindowIDRef ensuring
     // that it is not reused while this object exists
     void Set(size_t n, HWND hwnd, wxWindowID id)
     {
-        wxASSERT_MSG( n < m_count, _T("subwindow index out of range") );
+        wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
 
         m_hwnds[n] = hwnd;
         m_ids[n] = id;
@@ -115,7 +115,7 @@ public:
     void SetFont(const wxFont& font)
     {
         HFONT hfont = GetHfontOf(font);
-        wxCHECK_RET( hfont, _T("invalid font") );
+        wxCHECK_RET( hfont, wxT("invalid font") );
 
         for ( size_t n = 0; n < m_count; n++ )
         {
@@ -165,7 +165,7 @@ private:
     wxWindowIDRef *m_ids;
 
 
-    DECLARE_NO_COPY_CLASS(wxSubwindows)
+    wxDECLARE_NO_COPY_CLASS(wxSubwindows);
 };
 
 // convenient macro to forward a few methods which are usually propagated to