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

Doc & Symantec C++ fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-07 08:43:47 +00:00
parent 06cfab1738
commit 2432b92dd7
97 changed files with 576 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@@ -107,6 +107,8 @@
#if (__MWERKS__ < 0x1000) || !__option(bool)
typedef unsigned int bool;
#endif
#elif defined(__SC__)
typedef unsigned int bool;
#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
typedef unsigned int bool;
#elif defined(_MSC_VER) && (_MSC_VER == 1020)
@@ -120,7 +122,7 @@
typedef unsigned char bool;
#endif
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__)
#define byte unsigned char
#endif

4
include/wx/filefn.h
View File

@@ -37,6 +37,10 @@ typedef long off_t;
typedef long off_t;
#endif
#if defined(__SC__)
typedef long off_t;
#endif
const off_t wxInvalidOffset = (off_t)-1;
typedef enum {

10
include/wx/list.h
View File

@@ -127,6 +127,8 @@ private:
// wxNodeBase class is a (base for) node in a double linked list
// -----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
class WXDLLEXPORT wxNodeBase
{
friend class wxListBase;
@@ -136,7 +138,7 @@ public:
wxNodeBase *previous = (wxNodeBase *)NULL,
wxNodeBase *next = (wxNodeBase *)NULL,
void *data = NULL,
const wxListKey& key = wxListKey());
const wxListKey& key = wxDefaultListKey);
virtual ~wxNodeBase();
@@ -221,7 +223,7 @@ protected:
// create a node for the list of this type
virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,
void *data,
const wxListKey& key = wxListKey()) = 0;
const wxListKey& key = wxDefaultListKey) = 0;
// ctors
// from an array
@@ -334,7 +336,7 @@ private:
nodetype *previous = (nodetype *)NULL, \
nodetype *next = (nodetype *)NULL, \
T *data = (T *)NULL, \
const wxListKey& key = wxListKey()) \
const wxListKey& key = wxDefaultListKey) \
: wxNodeBase(list, previous, next, data, key) { } \
\
nodetype *GetNext() const \
@@ -408,7 +410,7 @@ private:
protected: \
wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
void *data, \
const wxListKey& key = wxListKey()) \
const wxListKey& key = wxDefaultListKey) \
{ \
return new nodetype(this, \
(nodetype *)prev, (nodetype *)next, \

5
include/wx/memory.h
View File

@@ -17,6 +17,7 @@
#endif
#include "wx/defs.h"
#include "wx/string.h"
/*
The macro which will be expanded to include the file and line number
@@ -37,8 +38,6 @@
# endif
#endif
#include "wx/string.h"
#ifdef __WXDEBUG__
void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
@@ -83,7 +82,9 @@ void operator delete[](void *buf, char*, int);
#endif
#endif
// wxUSE_GLOBAL_MEMORY_OPERATORS
#endif
// __WXDEBUG__
typedef unsigned int wxMarkerType;

1
include/wx/msw/dc.h
View File

@@ -21,6 +21,7 @@
#include "wx/icon.h"
#include "wx/font.h"
#include "wx/gdicmn.h"
#include "wx/window.h"
class WXDLLEXPORT wxDC: public wxObject
{

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

@@ -18,6 +18,8 @@
#include "wx/dialog.h"
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
class WXDLLEXPORT wxDirDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxDirDialog)

1
include/wx/msw/pen.h
View File

@@ -17,6 +17,7 @@
#endif
#include "wx/gdiobj.h"
#include "wx/bitmap.h"
typedef WXDWORD wxDash ;

4
include/wx/msw/private.h
View File

@@ -177,6 +177,10 @@ inline bool wxStyleHasBorder(long style)
#define WS_EX_CLIENTEDGE 0
#endif
#if defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
#define WS_EX_CLIENTEDGE 0x00000200L
#endif
#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
#ifdef OutputDebugString
#undef OutputDebugString

1
include/wx/msw/region.h
View File

@@ -18,6 +18,7 @@
#include "wx/list.h"
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
class WXDLLEXPORT wxRect;
class WXDLLEXPORT wxPoint;

4
include/wx/ownerdrw.h
View File

@@ -59,8 +59,8 @@ public:
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
inline wxBitmap& GetBitmap(bool bChecked = TRUE) const
{ return (wxBitmap &)(bChecked ? m_bmpChecked : m_bmpUnchecked); }
inline const wxBitmap& GetBitmap(bool bChecked = TRUE) const
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
// the height of the menu checkmark (or bitmap) is determined by the font
// for the current item, but the width should be always the same (for the

2
include/wx/propform.h
View File

@@ -275,7 +275,7 @@ class wxPropertyFormFrame: public wxFrame
public:
wxPropertyFormFrame(wxPropertyFormView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
wxFrame(parent, -1, title, pos, size, style, name)
{
m_view = v;

6
include/wx/proplist.h
View File

@@ -57,7 +57,9 @@
#define wxPROP_PULLDOWN 64
#define wxPROP_SHOWVALUES 128
#ifdef __XVIEW__
// Show OK/Cancel buttons on X-based systems where window management is
// more awkward
#if defined(__WXMOTIF__) || defined(__WXGTK__)
#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN
#else
#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
@@ -330,7 +332,7 @@ class wxPropertyListFrame: public wxFrame
public:
wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
wxFrame(parent, -1, title, pos, size, style, name)
{
m_view = v;

2
include/wx/string.h
View File

@@ -90,6 +90,8 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
{
#if defined(_MSC_VER)
return _stricmp(psz1, psz2);
#elif defined(__SC__)
return _stricmp(psz1, psz2);
#elif defined(__BORLANDC__)
return stricmp(psz1, psz2);
#elif defined(__WATCOMC__)