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 aec2e10df5bcc6a5173e502c7ab1060f762268e4..c8d7c0548062956bddf448017f84018760ebfe42 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;
 
 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
 
 
 // control bar states
 

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 4829235251f7f7637bbc7a8705a9cefd6146478b..9f63ff0ca42e990ea00549d7d6ee898ad147bc4a 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;
 
 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.
 
 /*
 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 c621053475e18efcf6abae3766f6204b8e2080e5..1d5b1c685d20272cb9ef51d318fd26079f22ad12 100644 (file)
--- 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)
 
     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)
 #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 db9868c916d044133e7153585412e8ba84025caa..f88d94fbebd41d8200e564f81fabf6172ea209b9 100644 (file)
--- 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.
 */
 
 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;
 {
 protected:
     wxList       mViews;

diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
index 1f27b72ee8069ba6e97f4c946ca9a9f3c0a318d5..046bb66e3c4577b1a4582678d231153c3cd4a0fa 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;
 
 
 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
 
 /*
 A tool window is a special kind of frame that paints its own title, and