added (and documented) trivial but useful IsSingleLine() and IsMultiLine() text contr...

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 2c8c64b7c8ad4df5df9f1f63a09b23e519bf3b3a..7e7e16ce55e49b8f08163b5fa32f46c75a6deb52 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,7 +21,7 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

-#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 


@@ -36,7 +36,8 @@ public:
     void SetChooseFull(bool flag) { chooseFull = flag; }
     bool GetChooseFull() const { return chooseFull; }
     void SetColour(const wxColour& colour) { dataColour = colour; }
     void SetChooseFull(bool flag) { chooseFull = flag; }
     bool GetChooseFull() const { return chooseFull; }
     void SetColour(const wxColour& colour) { dataColour = colour; }

-    wxColour &GetColour() { return dataColour; }
+    const wxColour& GetColour() const { return dataColour; }
+    wxColour& GetColour() { return dataColour; }

 
     // Array of 16 custom colours
     void SetCustomColour(int i, const wxColour& colour);
 
     // Array of 16 custom colours
     void SetCustomColour(int i, const wxColour& colour);


@@ -57,6 +58,37 @@ public:
     wxFontData();
     ~wxFontData();
 
     wxFontData();
     ~wxFontData();
 

+    wxFontData(const wxFontData& data)
+        : wxObject()
+        , fontColour(data.fontColour)
+        , showHelp(data.showHelp)
+        , allowSymbols(data.allowSymbols)
+        , enableEffects(data.enableEffects)
+        , initialFont(data.initialFont)
+        , chosenFont(data.chosenFont)
+        , minSize(data.minSize)
+        , maxSize(data.maxSize)
+        , m_encoding(data.m_encoding)
+        , m_encodingInfo(data.m_encodingInfo)
+    {
+    }
+
+    wxFontData& operator=(const wxFontData& data)
+    {
+        wxObject::operator=(data);
+        fontColour     = data.fontColour;
+        showHelp       = data.showHelp;
+        allowSymbols   = data.allowSymbols;
+        enableEffects  = data.enableEffects;
+        initialFont    = data.initialFont;
+        chosenFont     = data.chosenFont;
+        minSize        = data.minSize;
+        maxSize        = data.maxSize;
+        m_encoding     = data.m_encoding;
+        m_encodingInfo = data.m_encodingInfo;
+        return *this;
+    }
+                          

     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
     bool GetAllowSymbols() const { return allowSymbols; }
 
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
     bool GetAllowSymbols() const { return allowSymbols; }
 


@@ -118,6 +150,9 @@ class WXDLLEXPORT wxPrintData: public wxObject
     bool GetCollate() const { return m_printCollate; };
     int  GetOrientation() const { return m_printOrientation; };
 
     bool GetCollate() const { return m_printCollate; };
     int  GetOrientation() const { return m_printOrientation; };
 

+    // Is this data OK for showing the print dialog?
+    bool Ok() const ;
+

     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }


@@ -165,7 +200,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
     void operator=(const wxPrintData& data);
 
     // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

     void operator=(const wxPrintSetupData& setupData);
 #endif
 
     void operator=(const wxPrintSetupData& setupData);
 #endif
 


@@ -266,6 +301,9 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
     bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
     bool GetEnableHelp() const { return m_printEnableHelp; };
 

+    // Is this data OK for showing the print dialog?
+    bool Ok() const { return m_printData.Ok() ; }
+

     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 


@@ -339,6 +377,9 @@ public:
     bool GetDefaultInfo() const { return m_getDefaultInfo; };
     bool GetEnableHelp() const { return m_enableHelp; };
 
     bool GetDefaultInfo() const { return m_getDefaultInfo; };
     bool GetEnableHelp() const { return m_enableHelp; };
 

+    // Is this data OK for showing the page setup dialog?
+    bool Ok() 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.
     void SetPaperSize(const wxSize& sz);
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);


@@ -379,8 +420,8 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 

-    void operator=(const wxPageSetupData& data);
-    void operator=(const wxPrintData& data);
+    wxPageSetupDialogData& operator=(const wxPageSetupData& data);
+    wxPageSetupDialogData& operator=(const wxPrintData& data);

 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }