Compilation/warning fixes.

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 8310ce87b933f14f51c540c166f2c511e9067518..de78ad948a3e52ecd6ae72037363d342b1562c46 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -124,6 +124,11 @@
     #include <windows.h>
     #include "wx/msw/mslu.h"
 
+    // for _getcwd
+    #ifdef __MINGW32__
+        #include <io.h>
+    #endif
+
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>
@@ -1493,7 +1498,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     if ( needsANSI )
 #endif // wxUSE_UNICODE
     {
-    #ifdef _MSC_VER
+    #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     #elif defined(__WXMAC__) && !defined(__DARWIN__)
         FSSpec cwdSpec ;

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index d8649e494fcfd5461b30742ccb6e3cf0b407c297..f3cbfe6687b62f921e51bbb952f049bd3b01fdab 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -27,6 +27,8 @@
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
 #endif
 
 #include "wx/helpbase.h"

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 19e4307b25a9995ba10165805cc5160c4a611248..d63a6e1217510b538a82ef01a212013734b2d4ed 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -67,7 +67,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 {
     m_dialogStyle = style;
 
+#if wxUSE_STATIC_BITMAP
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+#endif
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index ce0088ba9c52563e1d4f46c2c906d68ef25fa981..05d2d1c7ad27c345cf8be1cd0f8780ec937a9261 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -49,6 +49,7 @@
 #include <oleacc.h>
 #include <winable.h>
 
+#include "wx/msw/winundef.h"
 #include "wx/msw/ole/oleutils.h"
 
 #ifndef CHILDID_SELF
@@ -79,7 +80,7 @@ class wxIEnumVARIANT : public IEnumVARIANT
 {
 public:
     wxIEnumVARIANT(const wxVariant& variant);
-    ~wxIEnumVARIANT() { }
+    virtual ~wxIEnumVARIANT() { }
 
     DECLARE_IUNKNOWN_METHODS;