allow passing temporary functors to Bind() too (closes #10653)

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

diff --git a/include/wx/msw/subwin.h b/include/wx/msw/subwin.h
index 06ba1433e59b40f291406820a8f808b09319c1c6..2c877186eb5099304d918a97789393951a666de9 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // 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
 {
 public:
     // the number of subwindows can be specified either as parameter to ctor or


@@ -61,7 +61,7 @@ public:
 
     HWND operator[](size_t n) const
     {
 
     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
     }
 
     // initialize the given window: id will be stored in wxWindowIDRef ensuring


@@ -165,7 +165,7 @@ private:
     wxWindowIDRef *m_ids;
 
 
     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
 };
 
 // convenient macro to forward a few methods which are usually propagated to