X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa96f01c02ca602769785fa4bad0dd69ae6cad05..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/cmndata.h?ds=sidebyside

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 35cee4ff50..a1a063ec27 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cmndata.h"
-#endif
-
 #include "wx/window.h"
 #include "wx/font.h"
 #include "wx/encinfo.h"
@@ -35,7 +31,7 @@ class WXDLLEXPORT wxColourData: public wxObject
 public:
     wxColourData();
     wxColourData(const wxColourData& data);
-    ~wxColourData();
+    virtual ~wxColourData();
 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }
     bool GetChooseFull() const { return m_chooseFull; }
@@ -58,24 +54,24 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColourData)
 };
 
-class WXDLLEXPORT wxFontData: public wxObject
+class WXDLLEXPORT wxFontData : public wxObject
 {
 public:
     wxFontData();
-    ~wxFontData();
+    virtual ~wxFontData();
 
     wxFontData(const wxFontData& data)
-        : wxObject()
-        , m_fontColour(data.m_fontColour)
-        , m_showHelp(data.m_showHelp)
-        , m_allowSymbols(data.m_allowSymbols)
-        , m_enableEffects(data.m_enableEffects)
-        , m_initialFont(data.m_initialFont)
-        , m_chosenFont(data.m_chosenFont)
-        , m_minSize(data.m_minSize)
-        , m_maxSize(data.m_maxSize)
-        , m_encoding(data.m_encoding)
-        , m_encodingInfo(data.m_encodingInfo)
+        : wxObject(),
+          m_fontColour(data.m_fontColour),
+          m_showHelp(data.m_showHelp),
+          m_allowSymbols(data.m_allowSymbols),
+          m_enableEffects(data.m_enableEffects),
+          m_initialFont(data.m_initialFont),
+          m_chosenFont(data.m_chosenFont),
+          m_minSize(data.m_minSize),
+          m_maxSize(data.m_maxSize),
+          m_encoding(data.m_encoding),
+          m_encodingInfo(data.m_encodingInfo)
     {
     }
 
@@ -90,8 +86,8 @@ public:
         m_chosenFont     = data.m_chosenFont;
         m_minSize        = data.m_minSize;
         m_maxSize        = data.m_maxSize;
-        m_encoding     = data.m_encoding;
-        m_encodingInfo = data.m_encodingInfo;
+        m_encoding       = data.m_encoding;
+        m_encodingInfo   = data.m_encodingInfo;
         return *this;
     }
 
@@ -99,7 +95,7 @@ public:
     bool GetAllowSymbols() const { return m_allowSymbols; }
 
     void SetColour(const wxColour& colour) { m_fontColour = colour; }
-    wxColour &GetColour() { return m_fontColour; }
+    const wxColour& GetColour() const { return m_fontColour; }
 
     void SetShowHelp(bool flag) { m_showHelp = flag; }
     bool GetShowHelp() const { return m_showHelp; }
@@ -123,6 +119,8 @@ public:
 
     wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
 
+
+    // public for backwards compatibility only: don't use directly
 public:
     wxColour        m_fontColour;
     bool            m_showHelp;
@@ -147,12 +145,6 @@ private:
  * Encapsulates printer information (not printer dialog information)
  */
 
-#ifdef __WXMAC__
-
-class wxNativePrintData ;
-
-#endif
-
 enum wxPrintBin
 {
     wxPRINTBIN_DEFAULT,
@@ -180,14 +172,15 @@ class WXDLLEXPORT wxPrintData: public wxObject
 public:
     wxPrintData();
     wxPrintData(const wxPrintData& printData);
-    ~wxPrintData();
+    virtual ~wxPrintData();
 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }
     int  GetOrientation() const { return m_printOrientation; }
 
     // Is this data OK for showing the print dialog?
-    bool Ok() const ;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const ;
 
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
@@ -251,11 +244,6 @@ public:
     // Holds the native print data
     wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
-public:
-#if defined(__WXMAC__)
-    wxNativePrintData* m_nativePrintData ;
-#endif
-
 private:
     wxPrintBin      m_bin;
     wxPrintMode     m_printMode;
@@ -295,7 +283,7 @@ public:
     wxPrintDialogData();
     wxPrintDialogData(const wxPrintDialogData& dialogData);
     wxPrintDialogData(const wxPrintData& printData);
-    ~wxPrintDialogData();
+    virtual ~wxPrintDialogData();
 
     int GetFromPage() const { return m_printFromPage; };
     int GetToPage() const { return m_printToPage; };
@@ -332,7 +320,8 @@ public:
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
     // Is this data OK for showing the print dialog?
-    bool Ok() const { return m_printData.Ok() ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_printData.Ok() ; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
@@ -340,11 +329,6 @@ public:
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 
-#if defined(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-
 private:
     int             m_printFromPage;
     int             m_printToPage;
@@ -381,7 +365,7 @@ public:
     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(); };
@@ -399,7 +383,8 @@ public:
     bool GetEnableHelp() const { return m_enableHelp; };
 
     // Is this data OK for showing the page setup dialog?
-    bool Ok() const { return m_printData.Ok() ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_printData.Ok() ; }
 
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
@@ -423,11 +408,6 @@ public:
     void EnablePrinter(bool flag) { m_enablePrinter = flag; };
     void EnableHelp(bool flag) { m_enableHelp = flag; };
 
-#if defined(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-
     // Use paper size defined in this object to set the wxPrintData
     // paper id
     void CalculateIdFromPaperSize();
@@ -439,6 +419,7 @@ public:
     wxPageSetupDialogData& operator=(const wxPrintData& data);
 
     wxPrintData& GetPrintData() { return m_printData; }
+    const wxPrintData& GetPrintData() const { return m_printData; }
     void SetPrintData(const wxPrintData& printData);
 
 private: