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
This commit is contained in:
@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
|
||||
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; }
|
||||
|
||||
|
@@ -16,6 +16,8 @@
|
||||
#pragma interface "oleutils.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
// ============================================================================
|
||||
// General purpose functions and macros
|
||||
// ============================================================================
|
||||
@@ -119,8 +121,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
|
||||
// Debugging support
|
||||
// ============================================================================
|
||||
|
||||
#ifdef __DEBUG__
|
||||
|
||||
#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
|
||||
// ----------------------------------------------------------------------------
|
||||
//
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -64,8 +64,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
|
||||
// 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
|
||||
|
Reference in New Issue
Block a user