More NO_PTR -> PTR compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h
index c8d7c0548062956bddf448017f84018760ebfe42..148ff094f6e54cddf323d973090d5425fec2b4ae 100644 (file)
--- 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 9f63ff0ca42e990ea00549d7d6ee898ad147bc4a..1a37a728c25b6fb5dcffdc4c2aab653a189e9ce8 100644 (file)
--- 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 1d5b1c685d20272cb9ef51d318fd26079f22ad12..010117b39dc24154f8fdc622bfaaff2540b53b7a 100644 (file)
--- 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 046bb66e3c4577b1a4582678d231153c3cd4a0fa..2737a94a0685071b0a7bef4869bd7135f9ccbd59 100644 (file)
--- 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