use wxSTRINGIZE instead of redefining a special STRINGIZE in this file

[wxWidgets.git] / include / wx / cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index d533e845468918b7866792c56a9b0ae1ef4ad477..f10801e67e46b63d037efb6afe1831a3b505c232 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -31,7 +31,7 @@ class WXDLLEXPORT wxColourData: public wxObject
 public:
     wxColourData();
     wxColourData(const wxColourData& data);
 public:
     wxColourData();
     wxColourData(const wxColourData& data);

-    ~wxColourData();
+    virtual ~wxColourData();

 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }
     bool GetChooseFull() const { return m_chooseFull; }
 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }
     bool GetChooseFull() const { return m_chooseFull; }


@@ -172,7 +172,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
 public:
     wxPrintData();
     wxPrintData(const wxPrintData& printData);
 public:
     wxPrintData();
     wxPrintData(const wxPrintData& printData);

-    ~wxPrintData();
+    virtual ~wxPrintData();

 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }
 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }


@@ -282,7 +282,7 @@ public:
     wxPrintDialogData();
     wxPrintDialogData(const wxPrintDialogData& dialogData);
     wxPrintDialogData(const wxPrintData& printData);
     wxPrintDialogData();
     wxPrintDialogData(const wxPrintDialogData& dialogData);
     wxPrintDialogData(const wxPrintData& printData);

-    ~wxPrintDialogData();
+    virtual ~wxPrintDialogData();

 
     int GetFromPage() const { return m_printFromPage; };
     int GetToPage() const { return m_printToPage; };
 
     int GetFromPage() const { return m_printFromPage; };
     int GetToPage() const { return m_printToPage; };


@@ -363,7 +363,7 @@ public:
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
     wxPageSetupDialogData(const wxPrintData& printData);
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
     wxPageSetupDialogData(const wxPrintData& printData);

-    ~wxPageSetupDialogData();
+    virtual ~wxPageSetupDialogData();

 
     wxSize GetPaperSize() const { return m_paperSize; };
     wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };
 
     wxSize GetPaperSize() const { return m_paperSize; };
     wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };