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

undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-07-22 00:24:07 +00:00
parent cd989b24ae
commit fc7a2a602b
130 changed files with 421 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/bmpbuttn.h
View File

@ -74,10 +74,13 @@ protected:
// the margins around the bitmap
int m_marginX,
m_marginY;
private:
// Prevent Virtual function hiding warnings
void SetLabel(const wxString& rsLabel)
{ wxWindowBase::SetLabel(rsLabel); }
{ wxWindowBase::SetLabel(rsLabel); }
DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)
};
#if defined(__WXUNIVERSAL__)

3
include/wx/busyinfo.h
View File

@ -28,6 +28,9 @@ class WXDLLEXPORT wxInfoFrame : public wxFrame
{
public:
wxInfoFrame(wxWindow *parent, const wxString& message);
private:
DECLARE_NO_COPY_CLASS(wxInfoFrame)
};

4
include/wx/button.h
View File

@ -48,6 +48,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
class WXDLLEXPORT wxButtonBase : public wxControl
{
public:
wxButtonBase() { }
// show the image in the button in addition to the label
virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
@ -60,6 +62,8 @@ public:
// returns the default button size for this platform
static wxSize GetDefaultSize();
DECLARE_NO_COPY_CLASS(wxButtonBase)
};
#if defined(__WXUNIVERSAL__)

2
include/wx/calctrl.h
View File

@ -178,7 +178,7 @@ private:
wxDateTime m_date;
wxDateTime::WeekDay m_wday;
DECLARE_DYNAMIC_CLASS(wxCalendarEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxCalendarEvent)
};
// ----------------------------------------------------------------------------

5
include/wx/checkbox.h
View File

@ -27,11 +27,16 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
class WXDLLEXPORT wxCheckBoxBase : public wxControl
{
public:
wxCheckBoxBase() { }
// set/get the checked status of the listbox
virtual void SetValue(bool value) = 0;
virtual bool GetValue() const = 0;
bool IsChecked() const { return GetValue(); }
private:
DECLARE_NO_COPY_CLASS(wxCheckBoxBase)
};
#if defined(__WXUNIVERSAL__)

4
include/wx/checklst.h
View File

@ -23,9 +23,13 @@
class WXDLLEXPORT wxCheckListBoxBase : public wxListBox
{
public:
wxCheckListBoxBase() { }
// check list box specific methods
virtual bool IsChecked(size_t item) const = 0;
virtual void Check(size_t item, bool check = TRUE) = 0;
DECLARE_NO_COPY_CLASS(wxCheckListBoxBase)
};
#if defined(__WXUNIVERSAL__)

7
include/wx/choice.h
View File

@ -37,9 +37,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
// all generic methods are in wxControlWithItems
wxChoiceBase() { }
virtual ~wxChoiceBase();
// all generic methods are in wxControlWithItems
// single selection logic
virtual void SetSelection(int n) = 0;
virtual bool SetStringSelection(const wxString& s);
@ -54,6 +56,9 @@ public:
// emulate selecting the item event.GetInt()
void Command(wxCommandEvent& event);
private:
DECLARE_NO_COPY_CLASS(wxChoiceBase)
};
// ----------------------------------------------------------------------------

4
include/wx/control.h
View File

@ -35,6 +35,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
class WXDLLEXPORT wxControlBase : public wxWindow
{
public:
wxControlBase() { }
virtual ~wxControlBase();
// Create() function adds the validator parameter
@ -68,6 +70,8 @@ protected:
// initialize the common fields of wxCommandEvent
void InitCommandEvent(wxCommandEvent& event) const;
DECLARE_NO_COPY_CLASS(wxControlBase)
};
// ----------------------------------------------------------------------------

2
include/wx/cshelp.h
View File

@ -79,7 +79,7 @@ public:
void OnContextHelp(wxCommandEvent& event);
private:
DECLARE_CLASS(wxContextHelpButton)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton)
DECLARE_EVENT_TABLE()
};

3
include/wx/ctrlsub.h
View File

@ -161,6 +161,9 @@ public:
{
return wxItemContainer::GetClientObject(n);
}
private:
DECLARE_NO_COPY_CLASS(wxControlWithItems);
};
#endif // wxUSE_CONTROLS

10
include/wx/dataobj.h
View File

@ -241,6 +241,8 @@ public:
private:
// the one and only format we support
wxDataFormat m_format;
DECLARE_NO_COPY_CLASS(wxDataObjectSimple)
};
// ----------------------------------------------------------------------------
@ -294,6 +296,8 @@ private:
// the index of the preferred one (0 initially, so by default the first
// one is the preferred)
size_t m_preferred;
DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
};
// ============================================================================
@ -341,6 +345,8 @@ private:
{ return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
{ return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
DECLARE_NO_COPY_CLASS(wxTextDataObject)
};
// ----------------------------------------------------------------------------
@ -364,6 +370,8 @@ public:
protected:
wxBitmap m_bitmap;
DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase)
};
// ----------------------------------------------------------------------------
@ -395,6 +403,8 @@ private:
{ return(wxDataObjectSimple::GetDataSize(format)); }
bool GetDataHere(const wxDataFormat& format, void* pBuf) const
{ return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
DECLARE_NO_COPY_CLASS(wxFileDataObjectBase)
};
// ----------------------------------------------------------------------------

5
include/wx/datetime.h
View File

@ -1490,8 +1490,9 @@ inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
return SetToWeekDay(weekday, -1, month, year);
}
inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday,
WeekFlags flags) const
inline wxDateTime
wxDateTime::GetWeekDayInSameWeek(WeekDay weekday,
WeekFlags WXUNUSED(flags)) const
{
MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) );
}

4
include/wx/dc.h
View File

@ -790,6 +790,8 @@ private:
wxDC& m_dc;
wxColour m_colFgOld;
DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)
};
// ----------------------------------------------------------------------------
@ -809,6 +811,8 @@ public:
private:
wxDC& m_dc;
DECLARE_NO_COPY_CLASS(wxDCClipper)
};
#endif

2
include/wx/dcbuffer.h
View File

@ -98,6 +98,8 @@ public:
// default copy ctor ok.
~wxBufferedPaintDC();
DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
};

2
include/wx/dcmirror.h
View File

@ -278,6 +278,8 @@ private:
wxMirrorDC& m_dc;
bool m_mirror;
DECLARE_NO_COPY_CLASS(wxMirrorDC)
};
#endif // _WX_DCMIRROR_H_

7
include/wx/defs.h
View File

@ -54,13 +54,10 @@
// suppress some Visual C++ warnings
#ifdef __VISUALC__
// the only "real" warning here is 4244 but there arej ust too many of them
// in our code... one day someone should go and fix them but until then...
# pragma warning(disable:4201) // nonstandard extension used: nameless struct/union
# pragma warning(disable:4244) // conversion from double to float
# pragma warning(disable:4100) // unreferenced formal parameter
# pragma warning(disable:4511) // copy ctor couldn't be generated
# pragma warning(disable:4512) // operator=() couldn't be generated
# pragma warning(disable:4699) // using precompiled header
# pragma warning(disable:4134) // conversion between pointers to members of same class
# pragma warning(disable:4710) // function not inlined
# pragma warning(disable:4097) // typedef used as class
#ifndef WIN32

1
include/wx/dialog.h
View File

@ -50,6 +50,7 @@ protected:
// the return code from modal dialog
int m_returnCode;
DECLARE_NO_COPY_CLASS(wxDialogBase)
DECLARE_EVENT_TABLE()
WX_DECLARE_CONTROL_CONTAINER();
};

6
include/wx/dnd.h
View File

@ -231,6 +231,9 @@ public:
virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
private:
DECLARE_NO_COPY_CLASS(wxTextDropTarget)
};
// A drop target which accepts files (dragged from File Manager or Explorer)
@ -244,6 +247,9 @@ public:
const wxArrayString& filenames) = 0;
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
private:
DECLARE_NO_COPY_CLASS(wxFileDropTarget)
};
#endif // wxUSE_DRAG_AND_DROP

104
include/wx/event.h
View File

@ -459,6 +459,8 @@ public:
private:
wxEvent& m_event;
int m_propagationLevelOld;
DECLARE_NO_COPY_CLASS(wxPropagationDisabler)
};
/*
@ -482,6 +484,8 @@ public:
private:
wxEvent& m_event;
DECLARE_NO_COPY_CLASS(wxPropagateOnce)
};
#if wxUSE_GUI
@ -508,9 +512,6 @@ private:
class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent
{
private:
wxCommandEvent& operator=(const wxCommandEvent& event);
public:
wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0);
@ -564,7 +565,7 @@ public:
wxClientData* m_clientObject; // Arbitrary client object
private:
DECLARE_DYNAMIC_CLASS(wxCommandEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
};
// this class adds a possibility to react (from the user) code to a control
@ -595,7 +596,7 @@ private:
bool m_bAllow;
private:
DECLARE_DYNAMIC_CLASS(wxNotifyEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
};
// Scroll event class, derived form wxCommandEvent. wxScrollEvents are
@ -626,7 +627,7 @@ public:
virtual wxEvent *Clone() const { return new wxScrollEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxScrollEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent)
};
// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
@ -663,7 +664,7 @@ public:
long m_extraLong;
private:
DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
};
// Mouse event class
@ -904,7 +905,7 @@ private:
wxCursor m_cursor;
private:
DECLARE_DYNAMIC_CLASS(wxSetCursorEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent)
};
// Keyboard input event class
@ -1051,7 +1052,7 @@ public:
wxRect m_rect; // Used for wxEVT_SIZING
private:
DECLARE_DYNAMIC_CLASS(wxSizeEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent)
};
// Move event class
@ -1088,7 +1089,7 @@ public:
wxRect m_rect;
private:
DECLARE_DYNAMIC_CLASS(wxMoveEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent)
};
// Paint event class
@ -1125,7 +1126,7 @@ public:
virtual wxEvent *Clone() const { return new wxPaintEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxPaintEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent)
};
class WXDLLIMPEXP_CORE wxNcPaintEvent : public wxEvent
@ -1138,7 +1139,7 @@ public:
virtual wxEvent *Clone() const { return new wxNcPaintEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxNcPaintEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent)
};
// Erase background event class
@ -1148,9 +1149,6 @@ private:
class WXDLLIMPEXP_CORE wxEraseEvent : public wxEvent
{
private:
wxEraseEvent& operator=(const wxEraseEvent& event);
public:
wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
: wxEvent(Id, wxEVT_ERASE_BACKGROUND),
@ -1169,7 +1167,7 @@ public:
wxDC *m_dc;
private:
DECLARE_DYNAMIC_CLASS(wxEraseEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent)
};
// Focus event class
@ -1180,9 +1178,6 @@ private:
class WXDLLIMPEXP_CORE wxFocusEvent : public wxEvent
{
private:
wxFocusEvent& operator=(const wxFocusEvent& event);
public:
wxFocusEvent(wxEventType type = wxEVT_NULL, int winid = 0)
: wxEvent(winid, type)
@ -1204,7 +1199,7 @@ private:
wxWindow *m_win;
private:
DECLARE_DYNAMIC_CLASS(wxFocusEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent)
};
// wxChildFocusEvent notifies the parent that a child has got the focus: unlike
@ -1219,7 +1214,7 @@ public:
virtual wxEvent *Clone() const { return new wxChildFocusEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxChildFocusEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent)
};
// Activate event class
@ -1246,7 +1241,7 @@ private:
bool m_active;
private:
DECLARE_DYNAMIC_CLASS(wxActivateEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent)
};
// InitDialog event class
@ -1264,7 +1259,7 @@ public:
virtual wxEvent *Clone() const { return new wxInitDialogEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxInitDialogEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent)
};
// Miscellaneous menu event class
@ -1279,7 +1274,7 @@ class WXDLLIMPEXP_CORE wxMenuEvent : public wxEvent
public:
wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL)
: wxEvent(winid, type)
{ m_menuId = winid; m_menu = NULL; }
{ m_menuId = winid; m_menu = menu; }
wxMenuEvent(const wxMenuEvent & event)
: wxEvent(event)
{ m_menuId = event.m_menuId; m_menu = event.m_menu; }
@ -1299,7 +1294,7 @@ private:
int m_menuId;
wxMenu* m_menu;
DECLARE_DYNAMIC_CLASS(wxMenuEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent)
};
// Window close or session close event class
@ -1368,7 +1363,7 @@ protected:
#endif
private:
DECLARE_DYNAMIC_CLASS(wxCloseEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent)
};
@ -1395,7 +1390,7 @@ protected:
bool m_show;
private:
DECLARE_DYNAMIC_CLASS(wxShowEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent)
};
/*
@ -1421,7 +1416,7 @@ protected:
bool m_iconized;
private:
DECLARE_DYNAMIC_CLASS(wxIconizeEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent)
};
/*
wxEVT_MAXIMIZE
@ -1437,7 +1432,7 @@ public:
virtual wxEvent *Clone() const { return new wxMaximizeEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent)
};
// Joystick event class
@ -1535,7 +1530,7 @@ public:
virtual wxEvent *Clone() const { return new wxJoystickEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxJoystickEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent)
};
// Drop files event class
@ -1545,9 +1540,6 @@ private:
class WXDLLIMPEXP_CORE wxDropFilesEvent : public wxEvent
{
private:
wxDropFilesEvent& operator=(const wxDropFilesEvent& event);
public:
int m_noFiles;
wxPoint m_pos;
@ -1588,7 +1580,7 @@ public:
virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent)
};
// Update UI event
@ -1681,7 +1673,7 @@ protected:
static wxUpdateUIMode sm_updateMode;
private:
DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent)
};
/*
@ -1699,7 +1691,7 @@ public:
virtual wxEvent *Clone() const { return new wxSysColourChangedEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent)
};
/*
@ -1710,9 +1702,6 @@ private:
class WXDLLIMPEXP_CORE wxMouseCaptureChangedEvent : public wxEvent
{
private:
wxMouseCaptureChangedEvent operator=(const wxMouseCaptureChangedEvent& event);
public:
wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL)
: wxEvent(winid, wxEVT_MOUSE_CAPTURE_CHANGED),
@ -1730,7 +1719,8 @@ public:
private:
wxWindow* m_gainedCapture;
DECLARE_DYNAMIC_CLASS(wxMouseCaptureChangedEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent)
};
/*
@ -1739,7 +1729,7 @@ private:
class WXDLLIMPEXP_CORE wxDisplayChangedEvent : public wxEvent
{
private:
DECLARE_DYNAMIC_CLASS(wxDisplayChangedEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent)
public:
wxDisplayChangedEvent()
@ -1755,9 +1745,6 @@ public:
class WXDLLIMPEXP_CORE wxPaletteChangedEvent : public wxEvent
{
private:
wxPaletteChangedEvent& operator=(const wxPaletteChangedEvent& event);
public:
wxPaletteChangedEvent(wxWindowID winid = 0)
: wxEvent(winid, wxEVT_PALETTE_CHANGED),
@ -1778,7 +1765,7 @@ protected:
wxWindow* m_changedWindow;
private:
DECLARE_DYNAMIC_CLASS(wxPaletteChangedEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent)
};
/*
@ -1808,7 +1795,7 @@ protected:
bool m_paletteRealized;
private:
DECLARE_DYNAMIC_CLASS(wxQueryNewPaletteEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent)
};
/*
@ -1818,9 +1805,6 @@ private:
// NB: don't derive from command event to avoid being propagated to the parent
class WXDLLIMPEXP_CORE wxNavigationKeyEvent : public wxEvent
{
private:
wxNavigationKeyEvent& operator=(const wxNavigationKeyEvent& event);
public:
wxNavigationKeyEvent()
: wxEvent(0, wxEVT_NAVIGATION_KEY),
@ -1874,7 +1858,7 @@ private:
wxWindow *m_focus;
private:
DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent)
};
// Window creation/destruction events: the first is sent as soon as window is
@ -1897,7 +1881,7 @@ public:
virtual wxEvent *Clone() const { return new wxWindowCreateEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent)
};
class WXDLLIMPEXP_CORE wxWindowDestroyEvent : public wxCommandEvent
@ -1910,7 +1894,7 @@ public:
virtual wxEvent *Clone() const { return new wxWindowDestroyEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent)
};
// A help event is sent when the user clicks on a window in context-help mode.
@ -1955,7 +1939,7 @@ protected:
wxString m_link;
private:
DECLARE_DYNAMIC_CLASS(wxHelpEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent)
};
// A Context event is sent when the user right clicks on a window or
@ -1990,7 +1974,7 @@ protected:
wxPoint m_pos;
private:
DECLARE_DYNAMIC_CLASS(wxContextMenuEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent)
};
// Idle event
@ -2045,7 +2029,7 @@ protected:
static wxIdleMode sm_idleMode;
private:
DECLARE_DYNAMIC_CLASS(wxIdleEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent)
};
#endif // wxUSE_GUI
@ -2138,6 +2122,9 @@ struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase
// objects will have been initialized (including the event type constants)
// and so it will have the correct value when it is needed
const int& m_eventType;
private:
wxEventTableEntry& operator=(const wxEventTableEntry&);
};
class WXDLLIMPEXP_BASE wxEvtHandler;
@ -2161,6 +2148,8 @@ struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase
// EventFunction is always a member of the EventHandler receiving the
// message
wxEvtHandler* m_eventSink;
DECLARE_NO_COPY_CLASS(wxDynamicEventTableEntry)
};
#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
@ -2223,6 +2212,8 @@ protected:
size_t m_size;
EventTypeTablePointer *m_eventTypeTable;
DECLARE_NO_COPY_CLASS(wxEventHashTable)
};
// ----------------------------------------------------------------------------
@ -2389,8 +2380,7 @@ protected:
virtual void *DoGetClientData() const;
private:
DECLARE_NO_COPY_CLASS(wxEvtHandler)
DECLARE_DYNAMIC_CLASS(wxEvtHandler)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
};
// Post a message to the given eventhandler which will be processed during the

2
include/wx/fdrepdlg.h
View File

@ -163,7 +163,7 @@ public:
private:
wxString m_strReplace;
DECLARE_DYNAMIC_CLASS(wxFindDialogEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)
};
BEGIN_DECLARE_EVENT_TYPES()

2
include/wx/fontdlg.h
View File

@ -57,6 +57,8 @@ protected:
{ if ( data ) m_fontData = *data; }
wxFontData m_fontData;
DECLARE_NO_COPY_CLASS(wxFontDialogBase)
};
// ----------------------------------------------------------------------------

3
include/wx/gauge.h
View File

@ -31,6 +31,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
class WXDLLEXPORT wxGaugeBase : public wxControl
{
public:
wxGaugeBase() { }
virtual ~wxGaugeBase();
bool Create(wxWindow *parent,
@ -67,6 +68,8 @@ protected:
// the current position
int m_gaugePos;
DECLARE_NO_COPY_CLASS(wxGaugeBase)
};
#if defined(__WXUNIVERSAL__)

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

@ -131,7 +131,7 @@ protected:
wxString m_stringSelection;
private:
DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog)
DECLARE_EVENT_TABLE()
};
@ -173,7 +173,7 @@ protected:
wxArrayInt m_selections;
private:
DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog)
};
// ----------------------------------------------------------------------------

20
include/wx/generic/grid.h
View File

@ -430,6 +430,8 @@ protected:
private:
size_t m_maxChars; // max number of chars allowed
wxString m_startValue;
DECLARE_NO_COPY_CLASS(wxGridCellTextEditor)
};
// the editor for numeric (long) data
@ -475,6 +477,8 @@ private:
m_max;
long m_valueOld;
DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor)
};
// the editor for floating point numbers (double) data
@ -508,6 +512,8 @@ private:
int m_width,
m_precision;
double m_valueOld;
DECLARE_NO_COPY_CLASS(wxGridCellFloatEditor)
};
#endif // wxUSE_TEXTCTRL
@ -518,6 +524,8 @@ private:
class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor
{
public:
wxGridCellBoolEditor() { }
virtual void Create(wxWindow* parent,
wxWindowID id,
wxEvtHandler* evtHandler);
@ -543,6 +551,8 @@ protected:
private:
bool m_startValue;
DECLARE_NO_COPY_CLASS(wxGridCellBoolEditor)
};
#endif // wxUSE_CHECKBOX
@ -586,6 +596,8 @@ protected:
wxString m_startValue;
wxArrayString m_choices;
bool m_allowOthers;
DECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor)
};
#endif // wxUSE_COMBOBOX
@ -974,7 +986,7 @@ private:
wxArrayString m_rowLabels;
wxArrayString m_colLabels;
DECLARE_DYNAMIC_CLASS( wxGridStringTable )
DECLARE_DYNAMIC_CLASS_NO_COPY( wxGridStringTable )
};
@ -1937,7 +1949,7 @@ protected:
bool m_shift;
bool m_alt;
DECLARE_DYNAMIC_CLASS(wxGridEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridEvent)
};
class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
@ -1969,7 +1981,7 @@ protected:
bool m_shift;
bool m_alt;
DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridSizeEvent)
};
@ -2016,7 +2028,7 @@ protected:
bool m_shift;
bool m_alt;
DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridRangeSelectEvent)
};

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

@ -110,6 +110,8 @@ public:
private:
long int m_startint;
DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor)
};
#endif // wxUSE_COMBOBOX
@ -124,6 +126,8 @@ public:
virtual wxGridCellEditor *Clone() const
{ return new wxGridCellAutoWrapStringEditor; }
DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
};
class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer

2
include/wx/generic/panelg.h
View File

@ -93,7 +93,7 @@ protected:
void Init();
private:
DECLARE_DYNAMIC_CLASS(wxPanel)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
DECLARE_EVENT_TABLE()
};

2
include/wx/generic/scrolwin.h
View File

@ -94,7 +94,7 @@ protected:
#endif // __WXMSW__
private:
DECLARE_ABSTRACT_CLASS(wxGenericScrolledWindow)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericScrolledWindow)
DECLARE_EVENT_TABLE()
};

2
include/wx/generic/splitter.h
View File

@ -350,7 +350,7 @@ private:
} pt; // position of double click for DCLICK event
} m_data;
DECLARE_DYNAMIC_CLASS(wxSplitterEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSplitterEvent)
};
typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);

2
include/wx/hash.h
View File

@ -584,6 +584,8 @@ private:
((listclass *)m_hashTable[slot])->Append(value, data); \
m_count++; \
} \
\
DECLARE_NO_COPY_CLASS(hashclass) \
}
#endif

6
include/wx/html/htmlcell.h
View File

@ -348,6 +348,8 @@ protected:
wxString m_Word;
bool m_allowLinebreak;
DECLARE_NO_COPY_CLASS(wxHtmlWordCell)
};
@ -482,6 +484,8 @@ public:
protected:
wxColour m_Colour;
unsigned m_Flags;
DECLARE_NO_COPY_CLASS(wxHtmlColourCell)
};
@ -503,6 +507,8 @@ public:
protected:
wxFont m_Font;
DECLARE_NO_COPY_CLASS(wxHtmlFontCell)
};

1
include/wx/html/m_templ.h
View File

@ -51,6 +51,7 @@ I STRONGLY recommend reading and understanding these macros!!
#define TAG_HANDLER_END(name) \
DECLARE_NO_COPY_CLASS(HTML_Handler_##name) \
};

2
include/wx/listbase.h
View File

@ -394,7 +394,7 @@ public:
wxListItem m_item;
private:
DECLARE_DYNAMIC_CLASS(wxListEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListEvent)
};
// ----------------------------------------------------------------------------

7
include/wx/listbox.h
View File

@ -43,10 +43,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
{
public:
// all generic methods are in wxControlWithItems, except for the following
// ones which are not yet implemented by wxChoice/wxCombobox
wxListBoxBase() { }
virtual ~wxListBoxBase();
// all generic methods are in wxControlWithItems, except for the following
// ones which are not yet implemented by wxChoice/wxCombobox
void Insert(const wxString& item, int pos)
{ DoInsert(item, pos); }
void Insert(const wxString& item, int pos, void *clientData)
@ -117,6 +118,8 @@ protected:
virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0;
virtual void DoSetFirstItem(int n) = 0;
DECLARE_NO_COPY_CLASS(wxListBoxBase)
};
// ----------------------------------------------------------------------------

2
include/wx/listctrl.h
View File

@ -97,7 +97,7 @@ public:
void ClearColumnImage(int col) { SetColumnImage(col, -1); }
private:
DECLARE_DYNAMIC_CLASS(wxListView)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxListView)
};
#endif // wxUSE_LISTCTRL

3
include/wx/log.h
View File

@ -381,6 +381,9 @@ class WXDLLIMPEXP_BASE wxLogPassThrough : public wxLogChain
{
public:
wxLogPassThrough();
private:
DECLARE_NO_COPY_CLASS(wxLogPassThrough)
};
#if wxUSE_GUI

2
include/wx/memconf.h
View File

@ -47,6 +47,8 @@ public:
0) // don't use any files
{
}
DECLARE_NO_COPY_CLASS(wxMemoryConfig)
};
#endif // wxUSE_CONFIG

3
include/wx/memtext.h
View File

@ -43,6 +43,9 @@ protected:
virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
wxMBConv& WXUNUSED(conv) = wxConvUTF8)
{ return TRUE; }
private:
DECLARE_NO_COPY_CLASS(wxMemoryText)
};
#endif // wxUSE_TEXTBUFFER

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

@ -102,6 +102,7 @@ protected:
bool m_keepGoing;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxApp)
};
int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance,

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

@ -59,7 +59,7 @@ public:
virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
};
#endif

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

@ -81,7 +81,7 @@ protected:
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;
private:
DECLARE_DYNAMIC_CLASS(wxButton)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
};
#endif

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

@ -59,6 +59,8 @@ protected:
private:
bool m_hasCaret;
DECLARE_NO_COPY_CLASS(wxCaret)
};
#endif // _WX_CARET_H_

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

@ -54,7 +54,7 @@ protected:
virtual wxSize DoGetBestSize() const;
private:
DECLARE_DYNAMIC_CLASS(wxCheckBox)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox)
};
#endif

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

@ -78,7 +78,7 @@ private:
size_t m_nItemHeight; // height of checklistbox items (the same for all)
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)
};
#endif //_CHECKLST_H

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

@ -22,8 +22,6 @@
class WXDLLEXPORT wxChoice : public wxChoiceBase
{
DECLARE_DYNAMIC_CLASS(wxChoice)
public:
// ctors
wxChoice() { }
@ -85,6 +83,8 @@ protected:
// free all memory we have (used by Clear() and dtor)
void Free();
DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
};
#endif // _WX_CHOICE_H_

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

@ -54,7 +54,7 @@ protected:
wxPoint m_pos;
DECLARE_DYNAMIC_CLASS(wxColourDialog)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
};
#endif

5
include/wx/msw/combobox.h
View File

@ -26,8 +26,6 @@
class WXDLLEXPORT wxComboBox: public wxChoice
{
DECLARE_DYNAMIC_CLASS(wxComboBox)
public:
wxComboBox() { }
@ -81,6 +79,9 @@ public:
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
WXHWND GetEditHWND() const;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
};
#endif // wxUSE_COMBOBOX

14
include/wx/msw/control.h
View File

@ -22,12 +22,12 @@
class WXDLLEXPORT wxControl : public wxControlBase
{
public:
wxControl();
wxControl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr)
wxControl();
wxControl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style, validator, name);
}
@ -119,7 +119,7 @@ protected:
wxArrayLong m_subControls;
private:
DECLARE_ABSTRACT_CLASS(wxControl)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
DECLARE_EVENT_TABLE()
};

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

@ -254,6 +254,9 @@ class WXDLLEXPORT wxDCTemp : public wxDC
public:
wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }
private:
DECLARE_NO_COPY_CLASS(wxDCTemp)
};
#endif

6
include/wx/msw/dcclient.h
View File

@ -53,7 +53,7 @@ protected:
virtual void DoGetSize(int *width, int *height) const;
private:
DECLARE_DYNAMIC_CLASS(wxWindowDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)
};
class WXDLLEXPORT wxClientDC : public wxWindowDC
@ -74,7 +74,7 @@ protected:
virtual void DoGetSize(int *width, int *height) const;
private:
DECLARE_DYNAMIC_CLASS(wxClientDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)
};
class WXDLLEXPORT wxPaintDC : public wxClientDC
@ -97,7 +97,7 @@ protected:
wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
private:
DECLARE_DYNAMIC_CLASS(wxPaintDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
};
#endif

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

@ -38,7 +38,7 @@ protected:
void Init();
private:
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)
};
#endif

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

@ -52,7 +52,7 @@ protected:
wxPrintData m_printData;
private:
DECLARE_CLASS(wxPrinterDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPrinterDC)
};
// Gets an HDC for the default printer configuration

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

@ -33,7 +33,7 @@ protected:
virtual void DoGetSize(int *width, int *height) const;
private:
DECLARE_DYNAMIC_CLASS(wxScreenDC)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
};
#endif

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

@ -42,7 +42,7 @@ protected:
wxString m_path;
private:
DECLARE_DYNAMIC_CLASS(wxDirDialog)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
};
#endif

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

@ -36,7 +36,7 @@ public:
: wxFontDialogBase(parent, data) { Create(parent, data); }
protected:
DECLARE_DYNAMIC_CLASS(wxFontDialog)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
};
#endif

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

@ -154,7 +154,7 @@ private:
bool m_wasMinimized;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)
};
#endif

5
include/wx/msw/gauge95.h
View File

@ -25,8 +25,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
// Group box
class WXDLLEXPORT wxGauge95 : public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGauge95)
public:
wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
@ -75,6 +73,9 @@ public:
protected:
int m_rangeMax;
int m_gaugePos;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
};
#endif // wxUSE_GAUGE

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

@ -129,7 +129,7 @@ protected:
#endif
private:
DECLARE_DYNAMIC_CLASS(wxListBox)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
};
#endif // wxUSE_LISTBOX

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

@ -189,7 +189,7 @@ private:
bool m_needsResize; // flag which tells us to artificially resize the frame
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
};
// ---------------------------------------------------------------------------
@ -224,7 +224,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)
};
#endif

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

@ -116,7 +116,7 @@ private:
wxAcceleratorArray m_accels;
#endif // wxUSE_ACCEL
DECLARE_DYNAMIC_CLASS(wxMenu)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)
};
// ----------------------------------------------------------------------------
@ -206,7 +206,7 @@ protected:
#endif
private:
DECLARE_DYNAMIC_CLASS(wxMenuBar)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
};
#endif // _WX_MENU_H_

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

@ -90,7 +90,7 @@ private:
// does this item start a radio group?
bool m_isRadioGroupStart;
DECLARE_DYNAMIC_CLASS(wxMenuItem)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
};
#endif //_MENUITEM_H

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

@ -153,7 +153,7 @@ protected:
int m_nSelection;
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook)
DECLARE_EVENT_TABLE()
};

8
include/wx/msw/ole/dataobj2.h
View File

@ -64,6 +64,9 @@ public:
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
private:
DECLARE_NO_COPY_CLASS(wxBitmapDataObject2)
};
// ----------------------------------------------------------------------------
@ -73,11 +76,16 @@ public:
class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
{
public:
wxFileDataObject() { }
// implement base class pure virtuals
virtual bool SetData(size_t len, const void *buf);
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *pData) const;
virtual void AddFile(const wxString& file);
private:
DECLARE_NO_COPY_CLASS(wxFileDataObject)
};
// ----------------------------------------------------------------------------

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

@ -42,7 +42,7 @@ protected:
// get the HWND to be used as parent of this window with CreateWindow()
virtual WXHWND MSWGetParent() const;
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
};
#endif // _WX_MSW_POPUPWIN_H_

5
include/wx/msw/printwin.h
View File

@ -49,8 +49,6 @@ private:
class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
{
DECLARE_CLASS(wxWindowsPrintPreview)
public:
wxWindowsPrintPreview(wxPrintout *printout,
wxPrintout *printoutForPrinting = NULL,
@ -62,6 +60,9 @@ public:
virtual bool Print(bool interactive);
virtual void DetermineScaling();
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
};
#endif

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

@ -66,7 +66,7 @@ private:
// see the comments in SetFocus()
bool m_focusJustSet;
DECLARE_DYNAMIC_CLASS(wxRadioButton)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
};
#endif

3
include/wx/msw/scrolbar.h
View File

@ -19,8 +19,6 @@
// Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
{
DECLARE_DYNAMIC_CLASS(wxScrollBar)
public:
wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
~wxScrollBar();
@ -81,6 +79,7 @@ protected:
int m_objectSize;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar)
};
#endif

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

@ -101,7 +101,7 @@ protected:
int width, int height,
int sizeFlags = wxSIZE_AUTO);
DECLARE_DYNAMIC_CLASS(wxSlider95)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95)
};
#endif

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

@ -63,7 +63,7 @@ protected:
virtual wxSize DoGetBestSize() const;
private:
DECLARE_DYNAMIC_CLASS(wxSpinButton)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
};
#endif

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

@ -51,7 +51,7 @@ protected:
virtual wxSize DoGetBestSize() const;
private:
DECLARE_DYNAMIC_CLASS(wxStaticBox)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
};
#endif

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

@ -66,7 +66,7 @@ protected:
void DoMoveWindow(int x, int y, int width, int height);
private:
DECLARE_DYNAMIC_CLASS(wxStatusBar95);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95);
};
#endif // wxUSE_NATIVE_STATUSBAR

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

@ -21,8 +21,6 @@
class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
{
DECLARE_DYNAMIC_CLASS(wxStaticLine)
public:
// constructors and pseudo-constructors
wxStaticLine() { }
@ -50,6 +48,8 @@ public:
protected:
// usually overridden base class virtuals
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine)
};
#endif // _WX_MSW_STATLINE_H_

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

@ -52,7 +52,7 @@ protected:
virtual wxSize DoGetBestSize() const;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
DECLARE_DYNAMIC_CLASS(wxStaticText)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};
#endif

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

@ -26,7 +26,7 @@ WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList);
class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
{
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public:
wxTaskBarIcon(void);
virtual ~wxTaskBarIcon(void);

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

@ -251,7 +251,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxTextCtrl)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
wxMenu* m_privateContextMenu;

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

@ -37,7 +37,7 @@ protected:
long m_id;
private:
DECLARE_ABSTRACT_CLASS(wxTimer)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
};
#endif

5
include/wx/notebook.h
View File

@ -159,7 +159,8 @@ public:
// hit test, returns which tab is hit and, optionally, where (icon, label)
// (not implemented on all platforms)
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const
virtual int HitTest(const wxPoint& WXUNUSED(pt),
long * WXUNUSED(flags) = NULL) const
{
return wxNOT_FOUND;
}
@ -218,7 +219,7 @@ private:
int m_nSel, // currently selected page
m_nOldSel; // previously selected page
DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebookEvent)
};
// ----------------------------------------------------------------------------

9
include/wx/object.h
View File

@ -145,6 +145,15 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
virtual wxClassInfo *GetClassInfo() const \
{ return &name::sm_class##name; }
#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \
private: \
name& operator=(const name&); \
DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_DYNAMIC_CLASS_NO_COPY(name) \
DECLARE_NO_COPY_CLASS(name) \
DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)

2
include/wx/popupwin.h
View File

@ -45,6 +45,8 @@ public:
// the point must be given in screen coordinates!
virtual void Position(const wxPoint& ptOrigin,
const wxSize& size);
DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
};

1
include/wx/prntbase.h
View File

@ -407,6 +407,7 @@ public:
private:
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)
};
#endif // wxUSE_PRINTING_ARCHITECTURE

2
include/wx/process.h
View File

@ -163,7 +163,7 @@ public:
int m_pid,
m_exitcode;
DECLARE_DYNAMIC_CLASS(wxProcessEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent)
};
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);

2
include/wx/protocol/file.h
View File

@ -24,7 +24,7 @@
#include "wx/url.h"
class WXDLLIMPEXP_BASE wxFileProto: public wxProtocol {
DECLARE_DYNAMIC_CLASS(wxFileProto)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
DECLARE_PROTOCOL(wxFileProto)
protected:
wxProtocolError m_error;

2
include/wx/protocol/ftp.h
View File

@ -156,7 +156,7 @@ protected:
friend class wxInputFTPStream;
friend class wxOutputFTPStream;
DECLARE_DYNAMIC_CLASS(wxFTP)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
DECLARE_PROTOCOL(wxFTP)
};

2
include/wx/protocol/protocol.h
View File

@ -82,7 +82,7 @@ public:
virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
private:
DECLARE_ABSTRACT_CLASS(wxProtocol)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)
};
#if wxUSE_SOCKETS

2
include/wx/renderer.h
View File

@ -150,6 +150,8 @@ public:
protected:
wxRendererNative& m_rendererNative;
DECLARE_NO_COPY_CLASS(wxDelegateRendererNative)
};
#endif // _WX_RENDERER_H_

2
include/wx/sckstrm.h
View File

@ -65,6 +65,8 @@ class WXDLLIMPEXP_BASE wxSocketStream : public wxSocketInputStream,
public:
wxSocketStream(wxSocketBase& s);
~wxSocketStream();
DECLARE_NO_COPY_CLASS(wxSocketStream)
};
#endif

5
include/wx/scrolbar.h
View File

@ -14,6 +14,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
class WXDLLEXPORT wxScrollBarBase : public wxControl
{
public:
wxScrollBarBase() { }
// scrollbar construction
bool Create(wxWindow *parent,
wxWindowID id,
@ -36,6 +38,9 @@ public:
virtual void SetScrollbar(int position, int thumbSize,
int range, int pageSize,
bool refresh = TRUE) = 0;
private:
DECLARE_NO_COPY_CLASS(wxScrollBarBase)
};
#if defined(__WXUNIVERSAL__)

3
include/wx/scrolwin.h
View File

@ -229,7 +229,7 @@ protected:
}
private:
DECLARE_CLASS(wxScrolledWindow)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
};
#define wxSCROLLED_WINDOW_IS_GENERIC 1
@ -238,4 +238,3 @@ protected:
#endif
// _WX_SCROLWIN_H_BASE_
// vi:sts=4:sw=4:et

4
include/wx/slider.h
View File

@ -42,6 +42,7 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
*/
wxSliderBase() { }
// get/set the current slider value (should be in range)
virtual int GetValue() const = 0;
@ -76,6 +77,9 @@ public:
virtual int GetSelEnd() const { return GetMin(); }
virtual int GetSelStart() const { return GetMax(); }
virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
private:
DECLARE_NO_COPY_CLASS(wxSliderBase)
};
// ----------------------------------------------------------------------------

2
include/wx/socket.h
View File

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

4
include/wx/spinbutt.h
View File

@ -68,6 +68,8 @@ protected:
// the range value
int m_min;
int m_max;
DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
};
// ----------------------------------------------------------------------------
@ -107,7 +109,7 @@ public:
void SetPosition(int pos) { m_commandInt = pos; }
private:
DECLARE_DYNAMIC_CLASS(wxSpinEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent)
};
typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);

5
include/wx/statbmp.h
View File

@ -31,7 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
// a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmapBase : public wxControl
{
public:
public:
wxStaticBitmapBase() { }
virtual ~wxStaticBitmapBase();
// our interface
@ -44,6 +45,8 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
protected:
virtual wxSize DoGetBestClientSize() const;
DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
};
#if defined(__WXUNIVERSAL__)

5
include/wx/statbox.h
View File

@ -14,8 +14,13 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
class WXDLLEXPORT wxStaticBoxBase : public wxControl
{
public:
wxStaticBoxBase() { }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
private:
DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
};
#if defined(__WXUNIVERSAL__)

2
include/wx/statline.h
View File

@ -72,6 +72,8 @@ protected:
{
return AdjustSize(wxDefaultSize);
}
DECLARE_NO_COPY_CLASS(wxStaticLineBase)
};
// ----------------------------------------------------------------------------

7
include/wx/stattext.h
View File

@ -10,8 +10,13 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
class WXDLLEXPORT wxStaticTextBase : public wxControl
{
public:
// overriden base class virtuals
wxStaticTextBase() { }
// overriden base cirtuals
virtual bool AcceptsFocus() const { return FALSE; }
private:
DECLARE_NO_COPY_CLASS(wxStaticTextBase)
};
#if defined(__WXUNIVERSAL__)

6
include/wx/stream.h
View File

@ -232,6 +232,8 @@ protected:
size_t m_wbackcur;
friend class wxStreamBuffer;
DECLARE_NO_COPY_CLASS(wxInputStream)
};
// ----------------------------------------------------------------------------
@ -264,6 +266,8 @@ protected:
virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
friend class wxStreamBuffer;
DECLARE_NO_COPY_CLASS(wxOutputStream)
};
// ============================================================================
@ -288,6 +292,8 @@ protected:
virtual off_t OnSysTell() const;
size_t m_currentPos;
DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
};
// ---------------------------------------------------------------------------

8
include/wx/taskbar.h
View File

@ -13,6 +13,11 @@
class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
{
public:
wxTaskBarIconBase() { }
private:
DECLARE_NO_COPY_CLASS(wxTaskBarIconBase)
};
@ -40,6 +45,9 @@ public:
}
virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
private:
DECLARE_NO_COPY_CLASS(wxTaskBarIconEvent)
};
BEGIN_DECLARE_EVENT_TYPES()

2
include/wx/tbarbase.h
View File

@ -606,7 +606,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxToolBarBase)
DECLARE_NO_COPY_CLASS(wxToolBarBase)
};
// Helper function for creating the image for disabled buttons

4
include/wx/textctrl.h
View File

@ -349,6 +349,8 @@ protected:
// the text style which will be used for any new text added to the control
wxTextAttr m_defaultStyle;
DECLARE_NO_COPY_CLASS(wxTextCtrlBase)
};
// ----------------------------------------------------------------------------
@ -415,7 +417,7 @@ protected:
m_end;
private:
DECLARE_DYNAMIC_CLASS(wxTextUrlEvent)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextUrlEvent)
public:
// for wxWin RTTI only, don't use

3
include/wx/textfile.h
View File

@ -47,7 +47,10 @@ protected:
virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv);
private:
wxFile m_file;
DECLARE_NO_COPY_CLASS(wxTextFile)
};
#else // !wxUSE_TEXTFILE

4
include/wx/timer.h
View File

@ -156,6 +156,8 @@ public:
private:
wxTimer& m_timer;
DECLARE_NO_COPY_CLASS(wxTimerRunner)
};
// ----------------------------------------------------------------------------
@ -181,7 +183,7 @@ public:
private:
int m_interval;
DECLARE_DYNAMIC_CLASS(wxTimerEvent)
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
};
typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);

Some files were not shown because too many files have changed in this diff Show More