AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fixes for Vadim's changes and Borland C++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-22 11:13:50 +00:00
parent 3479189669
commit a6cbc4db3d
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@ -2319,5 +2319,9 @@ typedef struct window_t *WXWidget;
classname(const classname&); \
classname& operator=(const classname&);
#define DECLARE_NO_ASSIGN_CLASS(classname) \
private: \
classname& operator=(const classname&);
#endif
// _WX_DEFS_H_

2
include/wx/dialup.h
View File

@ -184,7 +184,7 @@ public:
virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
private:
DECLARE_NO_COPY_CLASS(wxDialUpEvent)
DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent)
};
// the type of dialup event handler function

4
include/wx/generic/laywin.h
View File

@ -99,7 +99,7 @@ protected:
wxLayoutAlignment m_alignment;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxQueryLayoutInfoEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent)
};
typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
@ -136,7 +136,7 @@ protected:
wxRect m_rect;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxCalculateLayoutEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent)
};
typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);

3
include/wx/object.h
View File

@ -146,8 +146,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
{ return &name::sm_class##name; }
#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \
private: \
name& operator=(const name&); \
DECLARE_NO_ASSIGN_CLASS(name) \
DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_DYNAMIC_CLASS_NO_COPY(name) \

2
include/wx/socket.h
View File

@ -361,7 +361,7 @@ public:
wxSocketNotify m_event;
void *m_clientData;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSocketEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent)
};

2
include/wx/taskbar.h
View File

@ -47,7 +47,7 @@ public:
virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
private:
DECLARE_NO_COPY_CLASS(wxTaskBarIconEvent)
DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent)
};
BEGIN_DECLARE_EVENT_TYPES()