From 201812a8502c16d577bebb4c0e61ea0b35d6e0f6 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 2 Jul 1998 15:17:35 +0000 Subject: [PATCH] Removed some consts from tabctrl.h; fixed some other errors git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/memory.h | 2 ++ include/wx/msw/gauge.h | 2 +- include/wx/msw/tabctrl.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/memory.h b/include/wx/memory.h index 840d5085ca..468acdfabf 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -56,8 +56,10 @@ void wxDebugFree(void * buf, bool isVect = FALSE); void * operator new (size_t size, char * fileName, int lineNum); void operator delete (void * buf); +#if !( defined (_MSC_VER) && (_MSC_VER <= 800) ) void * operator new[] (size_t size, char * fileName, int lineNum); void operator delete[] (void * buf); +#endif #define new WXDEBUG_NEW diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h index e4df50bc8a..d2effc3441 100644 --- a/include/wx/msw/gauge.h +++ b/include/wx/msw/gauge.h @@ -21,7 +21,7 @@ #define wxGauge wxGauge95 #define classwxGauge classwxGauge95 #else -#include "wx/msw/gaugemsw.h +#include "wx/msw/gaugemsw.h" #define wxGauge wxGaugeMSW #define classwxGauge classwxGaugeMSW #endif diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 6b9dd252b6..cd9e4590ed 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -98,8 +98,8 @@ class WXDLLEXPORT wxTabCtrl: public wxControl // Operations - bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = 0, const wxString& name = "tabCtrl"); + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, + long style = 0, const wxString& name = "tabCtrl"); // Delete all items bool DeleteAllItems();