Remove commented-out code.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index f9d4497c95438a528206d5e4ee0fc61e7adccc81..ff35a9f297e4f6639a4544178ea64019602dd560 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -377,11 +377,9 @@ typedef wxInt8 wxDash;
 
 class WXDLLEXPORT wxPenList : public wxList
 {
 
 class WXDLLEXPORT wxPenList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxPenList)
-

 public:
     wxPenList() { }
 public:
     wxPenList() { }

-    virtual ~wxPenList();
+    ~wxPenList();

 
     void AddPen(wxPen *pen);
     void RemovePen(wxPen *pen);
 
     void AddPen(wxPen *pen);
     void RemovePen(wxPen *pen);


@@ -390,11 +388,9 @@ public:
 
 class WXDLLEXPORT wxBrushList : public wxList
 {
 
 class WXDLLEXPORT wxBrushList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxBrushList)
-

 public:
     wxBrushList() { }
 public:
     wxBrushList() { }

-    virtual ~wxBrushList();
+    ~wxBrushList();

 
     void AddBrush(wxBrush *brush);
     void RemoveBrush(wxBrush *brush);
 
     void AddBrush(wxBrush *brush);
     void RemoveBrush(wxBrush *brush);


@@ -403,11 +399,9 @@ public:
 
 class WXDLLEXPORT wxFontList : public wxList
 {
 
 class WXDLLEXPORT wxFontList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxFontList)
-

 public:
     wxFontList() { }
 public:
     wxFontList() { }

-    virtual ~wxFontList();
+    ~wxFontList();

 
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
 
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);


@@ -421,11 +415,9 @@ class WXDLLEXPORT wxStringToColourHashMap;
 
 class WXDLLEXPORT wxColourDatabase
 {
 
 class WXDLLEXPORT wxColourDatabase
 {

-    // DECLARE_CLASS(wxColourDatabase)
-

 public:
     wxColourDatabase();
 public:
     wxColourDatabase();

-    virtual ~wxColourDatabase() ;
+    ~wxColourDatabase() ;

 
     // Not const because it may add a name to the database
     wxColour *FindColour(const wxString& colour) ;
 
     // Not const because it may add a name to the database
     wxColour *FindColour(const wxString& colour) ;


@@ -446,11 +438,9 @@ private:
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxBitmapList)
-

 public:
     wxBitmapList();
 public:
     wxBitmapList();

-    virtual ~wxBitmapList();
+    ~wxBitmapList();

 
     void AddBitmap(wxBitmap *bitmap);
     void RemoveBitmap(wxBitmap *bitmap);
 
     void AddBitmap(wxBitmap *bitmap);
     void RemoveBitmap(wxBitmap *bitmap);


@@ -463,10 +453,7 @@ public:
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif

-    virtual ~wxResourceCache();
-
-private:
-    // DECLARE_DYNAMIC_CLASS(wxResourceCache)
+    ~wxResourceCache();

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 20450b557e11dd12a355e1dad5b8fd324d1716d9..280d4d94c3e680f0df0a278df137ec32b6e4e55b 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -64,12 +64,6 @@
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 #endif

-//IMPLEMENT_CLASS(wxColourDatabase, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)

 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)