diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h index 9d7da82f3f..70985121ea 100644 --- a/include/wx/ribbon/buttonbar.h +++ b/include/wx/ribbon/buttonbar.h @@ -23,8 +23,8 @@ class wxRibbonButtonBarButtonBase; class wxRibbonButtonBarLayout; class wxRibbonButtonBarButtonInstance; -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonButtonBarLayout*, wxArrayRibbonButtonBarLayout, class WXDLLIMPEXP_RIBBON); -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonButtonBarButtonBase*, wxArrayRibbonButtonBarButtonBase, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarLayout*, wxArrayRibbonButtonBarLayout, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarButtonBase*, wxArrayRibbonButtonBarButtonBase, class WXDLLIMPEXP_RIBBON); class WXDLLIMPEXP_RIBBON wxRibbonButtonBar : public wxRibbonControl { diff --git a/include/wx/ribbon/control.h b/include/wx/ribbon/control.h index 7edb02d2f2..35cfd5777c 100644 --- a/include/wx/ribbon/control.h +++ b/include/wx/ribbon/control.h @@ -71,7 +71,7 @@ private: #endif }; -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonControl*, wxArrayRibbonControl, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonControl*, wxArrayRibbonControl, class WXDLLIMPEXP_RIBBON); #endif // wxUSE_RIBBON diff --git a/include/wx/ribbon/gallery.h b/include/wx/ribbon/gallery.h index 01d89841e5..5e59de37a4 100644 --- a/include/wx/ribbon/gallery.h +++ b/include/wx/ribbon/gallery.h @@ -20,7 +20,7 @@ class wxRibbonGalleryItem; -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonGalleryItem*, wxArrayRibbonGalleryItem, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonGalleryItem*, wxArrayRibbonGalleryItem, class WXDLLIMPEXP_RIBBON); class WXDLLIMPEXP_RIBBON wxRibbonGallery : public wxRibbonControl { diff --git a/include/wx/ribbon/toolbar.h b/include/wx/ribbon/toolbar.h index eda16e4b3f..f15995e93d 100644 --- a/include/wx/ribbon/toolbar.h +++ b/include/wx/ribbon/toolbar.h @@ -20,7 +20,7 @@ class wxRibbonToolBarToolBase; class wxRibbonToolBarToolGroup; -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonToolBarToolGroup*, wxArrayRibbonToolBarToolGroup, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonToolBarToolGroup*, wxArrayRibbonToolBarToolGroup, class WXDLLIMPEXP_RIBBON); enum wxRibbonToolBarToolState { diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp index cd4817e0a2..5715d6e1bc 100644 --- a/src/ribbon/toolbar.cpp +++ b/src/ribbon/toolbar.cpp @@ -44,7 +44,7 @@ public: long state; }; -WX_DEFINE_ARRAY(wxRibbonToolBarToolBase*, wxArrayRibbonToolBarToolBase); +WX_DEFINE_ARRAY_PTR(wxRibbonToolBarToolBase*, wxArrayRibbonToolBarToolBase); class wxRibbonToolBarToolGroup {