Reverted due to Darwin and other conflicts.

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

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index 8f619cb8390649845a197d836b5d39de6bd4aba9..4ea73af904449493b962eb4f0dcc254170fa08c3 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxCommand : public wxObject
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);

-    ~wxCommand(){};
+    ~wxCommand(){}

 
     // Override this to perform a command
     virtual bool Do() = 0;
 
     // Override this to perform a command
     virtual bool Do() = 0;

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index b691d39a360abafd5b7b8c2f4d49d8d288b9c209..190ff341aa055ae83bda4b20d1846debe688864d 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -30,7 +30,7 @@ public:
 #else
     wxDataInputStream(wxInputStream& s);
 #endif
 #else
     wxDataInputStream(wxInputStream& s);
 #endif

-    ~wxDataInputStream(){};
+    ~wxDataInputStream(){}

 
     bool IsOk() { return m_input->IsOk(); }
 
 
     bool IsOk() { return m_input->IsOk(); }
 


@@ -78,7 +78,7 @@ public:
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif

-    ~wxDataOutputStream(){};
+    ~wxDataOutputStream(){}

 
     bool IsOk() { return m_output->IsOk(); }
 
 
     bool IsOk() { return m_output->IsOk(); }
 

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 233d4a0b54f1aaddfe9d49ed8e18425cd9086c19..59aefd6a5c3de1d9b489a2967776c36a358b7b41 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -64,7 +64,7 @@ public:
 #endif // Unicode/ANSI
 
     // virtual dtor for any base class
 #endif // Unicode/ANSI
 
     // virtual dtor for any base class

-    virtual ~wxMBConv(){};
+    virtual ~wxMBConv();

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------