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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 59a096dad655538e415816e1b71124f47cc577d9..1831c6a5ba6a1352ea95f93c28c155432a4709cc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2319,5 +2319,9 @@ typedef struct window_t *WXWidget;
         classname(const classname&);            \
         classname& operator=(const classname&);
 
         classname(const classname&);            \
         classname& operator=(const classname&);
 

+#define DECLARE_NO_ASSIGN_CLASS(classname)      \
+    private:                                    \
+        classname& operator=(const classname&);
+

 #endif
     // _WX_DEFS_H_
 #endif
     // _WX_DEFS_H_

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index a38627daf139d6865d7156fe7d9dabd8b4f5d6ec..8f4c5ee83bb241c5ae46490937f0f1c1fd49503f 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -184,7 +184,7 @@ public:
     virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
 
 private:
     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
 };
 
 // the type of dialup event handler function

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 6451ece88dd3ae809941b9ca88d0b71eb8446ef0..ccbb0e58ee586bf45f6d0ae264ee18829a0097f7 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -99,7 +99,7 @@ protected:
     wxLayoutAlignment       m_alignment;
     
 private:
     wxLayoutAlignment       m_alignment;
     
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxQueryLayoutInfoEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent)

 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);


@@ -136,7 +136,7 @@ protected:
     wxRect                  m_rect;
     
 private:
     wxRect                  m_rect;
     
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCalculateLayoutEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent)

 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);

diff --git a/include/wx/object.h b/include/wx/object.h
index bfecd72a2ab0855e101ef32b531b0b5c3e826d58..1a2a2c8038de3915f03c6d27e71196ff3858124d 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -146,8 +146,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
    { return &name::sm_class##name; }
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(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)   \
     DECLARE_DYNAMIC_CLASS(name)
 
 #define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \

diff --git a/include/wx/socket.h b/include/wx/socket.h
index ca7c8fa490c3bf039360f8e55fe5d3ca8c82c868..965f39a9210dedef34d39987dcd68b1123c529c2 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -361,7 +361,7 @@ public:
   wxSocketNotify  m_event;
   void           *m_clientData;
 
   wxSocketNotify  m_event;
   void           *m_clientData;
 

-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxSocketEvent)
+  DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent)

 };
 
 
 };
 
 

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index de482f4dcd0da3f918ab4ea5c36a1460417fdec7..1e5e4d81e9def984d8aebfa9fe1e81b13b0c58a6 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -47,7 +47,7 @@ public:
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
 
 private:
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
 
 private:

-    DECLARE_NO_COPY_CLASS(wxTaskBarIconEvent)
+    DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent)

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()