Digital Mars compilation warnings and Unicode fixes (patch 884587)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-07 15:07:08 +00:00
parent b9b1f368fe
commit ba1e9d6ced
6 changed files with 21 additions and 4 deletions
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1303,6 +1303,7 @@ bool wxRemoveFile(const wxString& file)
 #if defined(__VISUALC__) \
 || defined(__BORLANDC__) \
 || defined(__WATCOMC__) \
+ || defined(__DMC__) \
 || defined(__GNUWIN32__)
  int res = wxRemove(file);
 #elif defined(__WXMAC__)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -694,7 +694,7 @@ bool wxComboBox::Create(wxWindow *parent,
                        const wxPoint& pos,
                        const wxSize& size,
                        int n,
-                        const wxString *choices,
+                        const wxString choices[],
                        long style,
                        const wxValidator& validator,
                        const wxString& name)