compilation fixes for MSW+Univ+Mingw32

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 4fc3c975424a95d8fc7644fd4327fd23f45656d0..12a2aa179762458e2b88f8bee713d0d895fc4e12 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -93,7 +93,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
 
 
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //


@@ -329,7 +329,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
             // tell the user what he should do...
             m_btnAbort->SetLabel(_("Close"));
         }
             // tell the user what he should do...
             m_btnAbort->SetLabel(_("Close"));
         }

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

         else // enable the close button to give the user a way to close the dlg
         {
             EnableCloseButton(TRUE);
         else // enable the close button to give the user a way to close the dlg
         {
             EnableCloseButton(TRUE);

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 0bb2d38f6a15f924e5fa6ef3fd3608204966987d..ba6e499d571f4e67ac4947133b21e371a685e622 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -49,6 +49,10 @@
     #undef WXDEBUG_SCROLLBAR
 #endif // !__WXDEBUG__
 
     #undef WXDEBUG_SCROLLBAR
 #endif // !__WXDEBUG__
 

+#if defined(WXDEBUG_SCROLLBAR) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#include "wx/msw/private.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxScrollBarTimer: this class is used to repeatedly scroll the scrollbar
 // when the mouse is help pressed on the arrow or on the bar. It generates the
 // ----------------------------------------------------------------------------
 // wxScrollBarTimer: this class is used to repeatedly scroll the scrollbar
 // when the mouse is help pressed on the arrow or on the bar. It generates the

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 69e3c6cd2fd219cc1f4be0c322d196122dcc4cc7..18242c45b5870c00205b440dca9e6d23069b61f9 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -54,6 +54,10 @@
     #undef WXDEBUG_REFRESH
 #endif
 
     #undef WXDEBUG_REFRESH
 #endif
 

+#if defined(WXDEBUG_REFRESH) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#include "wx/msw/private.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================