From 659f8ec331fa31ffdf5a8d2efbc68a1b62ba3537 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 25 Oct 2003 08:52:23 +0000 Subject: [PATCH] More NO_PTR -> PTR compilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/fl/controlbar.h | 4 ++-- contrib/include/wx/fl/dyntbar.h | 4 ++-- contrib/include/wx/fl/fldefs.h | 4 ++-- contrib/include/wx/fl/toolwnd.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h index c8d7c05480..148ff094f6 100644 --- a/contrib/include/wx/fl/controlbar.h +++ b/contrib/include/wx/fl/controlbar.h @@ -44,8 +44,8 @@ class WXDLLIMPEXP_FL cbCommonPaneProperties; typedef cbBarInfo* BarInfoPtrT; typedef cbRowInfo* RowInfoPtrT; -WXFL_DEFINE_ARRAY_NO_PTR( BarInfoPtrT, BarArrayT ); -WXFL_DEFINE_ARRAY_NO_PTR( RowInfoPtrT, RowArrayT ); +WXFL_DEFINE_ARRAY_PTR( BarInfoPtrT, BarArrayT ); +WXFL_DEFINE_ARRAY_PTR( RowInfoPtrT, RowArrayT ); // control bar states diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h index 9f63ff0ca4..1a37a728c2 100644 --- a/contrib/include/wx/fl/dyntbar.h +++ b/contrib/include/wx/fl/dyntbar.h @@ -38,8 +38,8 @@ class WXDLLIMPEXP_FL wxDynToolInfo; typedef wxToolLayoutItem* wxToolLayoutItemPtrT; typedef wxDynToolInfo* wxDynToolInfoPtrT; -WXFL_DEFINE_ARRAY_NO_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT ); -WXFL_DEFINE_ARRAY_NO_PTR( wxDynToolInfoPtrT, wxDynToolInfoArrayT ); +WXFL_DEFINE_ARRAY_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT ); +WXFL_DEFINE_ARRAY_PTR( wxDynToolInfoPtrT, wxDynToolInfoArrayT ); /* This is a base class for layout algorithm implementations. diff --git a/contrib/include/wx/fl/fldefs.h b/contrib/include/wx/fl/fldefs.h index 1d5b1c685d..010117b39d 100644 --- a/contrib/include/wx/fl/fldefs.h +++ b/contrib/include/wx/fl/fldefs.h @@ -34,9 +34,9 @@ class WXDLLIMPEXP_FL l; \ WX_DEFINE_ARRAY(c,l) -#define WXFL_DEFINE_ARRAY_NO_PTR(c,l)\ +#define WXFL_DEFINE_ARRAY_PTR(c,l)\ class WXDLLIMPEXP_FL l; \ - WX_DEFINE_ARRAY_NO_PTR(c,l) + WX_DEFINE_ARRAY_PTR(c,l) #define WXFL_DEFINE_ARRAY_LONG(t,l) \ class WXDLLIMPEXP_FL l; \ diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h index 046bb66e3c..2737a94a06 100644 --- a/contrib/include/wx/fl/toolwnd.h +++ b/contrib/include/wx/fl/toolwnd.h @@ -31,7 +31,7 @@ class WXDLLIMPEXP_FL cbMiniButton; typedef cbMiniButton* cbMinitButtonPtrT; -WXFL_DEFINE_ARRAY_NO_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT ); +WXFL_DEFINE_ARRAY_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT ); /* A tool window is a special kind of frame that paints its own title, and -- 2.45.2