Fixed event arg in notebook.h, #ifdefed out some functions in oleutils that

don't compile in VC++ 4.

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 2514158818888a56b9c47fa38fb66b5d893d37ec..aa4186379fb615ffed27bd81ac91bc35afe0d20c 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
 {
 public:
 class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
 {
 public:

-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0, 
+  wxNotebookEvent(WXTYPE commandType = wxEVT_NULL, int id = 0,

                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 
                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 1430abbbe294aecd3e20e65703cfb161354c65b9..b31268ca0bc5604abf16886fe0b48f60d2c604ad 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -16,6 +16,8 @@
 #pragma interface "oleutils.h"
 #endif
 
 #pragma interface "oleutils.h"
 #endif
 

+#include "wx/defs.h"
+

 // ============================================================================
 // General purpose functions and macros
 // ============================================================================
 // ============================================================================
 // General purpose functions and macros
 // ============================================================================


@@ -119,8 +121,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // Debugging support
 // ============================================================================
 
 // Debugging support
 // ============================================================================
 

-#ifdef  __DEBUG__
-
+#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)

 // ----------------------------------------------------------------------------
 // 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 39165f2aac1f91956f74f7a2d04654ef40de0e95..92a16e713a189690e9303293392043e44021a846 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -64,8 +64,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 // Debug support
 // ----------------------------------------------------------------------------
 
 // Debug support
 // ----------------------------------------------------------------------------
 

-#ifdef  __DEBUG__
-
+#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)

 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID