Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Julian Smart
1998-07-08 10:05:51 +00:00
parent 6163f5d8b0
commit e5ad6961eb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/notebook.h
View File

@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
{ {
public: public:
wxNotebookEvent(WXTYPE commandType = 0, int id = 0, wxNotebookEvent(WXTYPE commandType = wxEVT_NULL, int id = 0,
int nSel = -1, int nOldSel = -1) int nSel = -1, int nOldSel = -1)
: wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }

5
include/wx/msw/ole/oleutils.h
View File

@@ -16,6 +16,8 @@
#pragma interface "oleutils.h" #pragma interface "oleutils.h"
#endif #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)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// //
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

3
src/msw/ole/oleutils.cpp
View File

@@ -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) const char *GetIidName(REFIID riid)
{ {
// an association between symbolic name and numeric value of an IID // an association between symbolic name and numeric value of an IID