From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 15 Aug 2003 08:07:24 +0000 (+0000)
Subject: Applied patch [ 787350 ] removes warnings in FL under Open Watcom
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2913c590b0606843efb39548344298c19d67711b

Applied patch [ 787350 ] removes warnings in FL under Open Watcom


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

diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h
index aec2e10df5..c8d7c05480 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( BarInfoPtrT, BarArrayT );
-WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( BarInfoPtrT, BarArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( RowInfoPtrT, RowArrayT );
 
 // control bar states
 
diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 4829235251..9f63ff0ca4 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( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WXFL_DEFINE_ARRAY_NO_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 c621053475..1d5b1c685d 100644
--- a/contrib/include/wx/fl/fldefs.h
+++ b/contrib/include/wx/fl/fldefs.h
@@ -34,6 +34,10 @@
     class WXDLLIMPEXP_FL l;          \
     WX_DEFINE_ARRAY(c,l)
 
+#define WXFL_DEFINE_ARRAY_NO_PTR(c,l)\
+    class WXDLLIMPEXP_FL l;          \
+    WX_DEFINE_ARRAY_NO_PTR(c,l)
+
 #define WXFL_DEFINE_ARRAY_LONG(t,l) \
     class WXDLLIMPEXP_FL l;          \
     WX_DEFINE_ARRAY_LONG(t,l)
diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
index db9868c916..f88d94fbeb 100644
--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -87,7 +87,7 @@ class wxFrame;
 It is not clear what this class does. It is not used elsewhere in FL.
 */
 
-class WXDLLIMPEXP_FL wxFrameManager : wxObject
+class WXDLLIMPEXP_FL wxFrameManager : public wxObject
 {
 protected:
     wxList       mViews;
diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
index 1f27b72ee8..046bb66e3c 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( cbMinitButtonPtrT, cbMiniButtonArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT );
 
 /*
 A tool window is a special kind of frame that paints its own title, and