Added some pragmas, to address problem mentioned

in bug report:

[ 670355 ] Borland C++ 5.5 with wxW 2.4.0


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

include/wx/confbase.h

@@ -62,6 +62,10 @@ enum
     wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 // ----------------------------------------------------------------------------
 // abstract base class wxConfigBase which defines the interface for derived
 // classes
@@ -287,6 +291,10 @@ private:
   long              m_style;
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 // a handy little class which changes current path to the path of given entry
 // and restores it in dtor: so if you declare a local variable of this type,
 // you work in the entry directory and the path is automatically restored

include/wx/dynload.h

@@ -40,7 +40,16 @@
 
 class WXDLLEXPORT wxPluginLibrary;
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxPluginLibrary *, wxDLManifest);
+
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 typedef wxDLManifest wxDLImports;
 
 // ----------------------------------------------------------------------------
@@ -98,6 +107,10 @@ enum wxDLFlags
 };
 
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 class WXDLLEXPORT wxDynamicLibrary
 {
 public:
@@ -170,6 +183,9 @@ protected:
     DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
 
 // ---------------------------------------------------------------------------
 // wxPluginLibrary

include/wx/event.h

@@ -1418,6 +1418,10 @@ private:
     DECLARE_DYNAMIC_CLASS(wxJoystickEvent)
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 // Drop files event class
 /*
  wxEVT_DROP_FILES
@@ -1471,6 +1475,11 @@ private:
     DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
+
 // Update UI event
 /*
  wxEVT_UPDATE_UI

include/wx/hashmap.h

@@ -28,6 +28,10 @@ struct WXDLLEXPORT _wxHashTable_NodeBase
     _wxHashTable_NodeBase* m_nxt;
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 // private
 class WXDLLEXPORT _wxHashTableBase2
 {
@@ -70,6 +74,10 @@ protected:
     }
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 #define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \
 CLASSEXP CLASSNAME : protected _wxHashTableBase2 \
 { \

include/wx/html/helpdata.h

@@ -79,6 +79,9 @@ protected:
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray);
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
 
 struct wxHtmlContentsItem
 {
@@ -92,6 +95,10 @@ struct wxHtmlContentsItem
     wxString GetFullPath() const { return m_Book->GetFullPath(m_Page); }
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 //------------------------------------------------------------------------------
 // wxHtmlSearchEngine
 //                  This class takes input streams and scans them for occurence

include/wx/image.h

@@ -95,10 +95,18 @@ public:
     unsigned long value;
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
                              wxIntegerHash, wxIntegerEqual,
                              wxImageHistogram);
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 //-----------------------------------------------------------------------------
 // wxImage
 //-----------------------------------------------------------------------------

include/wx/notebook.h

@@ -118,9 +118,17 @@ public:
     // remove one page from the notebook, without deleting it
     virtual bool RemovePage(int nPage) { return DoRemovePage(nPage) != NULL; }
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
     // remove all pages and delete them
     virtual bool DeleteAllPages() { WX_CLEAR_ARRAY(m_pages); return TRUE; }
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
     // adds a new page to the notebook (it will be deleted by the notebook,
     // don't delete it yourself) and make it the current one if bSelect
     virtual bool AddPage(wxNotebookPage *pPage,

include/wx/radiobox.h

@@ -22,6 +22,10 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
 // real wxRadioBox derives from different classes on different platforms: for
@@ -94,6 +98,10 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_2
 };
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobox.h"
 #elif defined(__WXMSW__)

src/common/artprov.cpp

@@ -49,8 +49,16 @@ WX_DEFINE_LIST(wxArtProvidersList);
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
+#ifdef __BORLANDC__
+#   pragma option -w-inl
+#endif
+
 WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
 
+#ifdef __BORLANDC__
+#   pragma option -w.inl
+#endif
+
 class WXDLLEXPORT wxArtProviderCache
 {
 public: