rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 95f2b7dc142183a1e1b3ad0d292593717cc4ef32..8127d23d073f43d002f6ef2371c53fac5a697f3f 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cmndata.h
+// Name:        wx/cmndata.h
 // Purpose:     Common GDI data classes
 // Author:      Julian Smart and others
 // Modified by:
@@ -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,
@@ -174,20 +166,23 @@ enum wxPrintBin
     wxPRINTBIN_USER
 };
 
+const int wxPRINTMEDIA_DEFAULT = 0;
 
 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; };
+    int GetNoCopies() const { return m_printNoCopies; }
+    bool GetCollate() const { return m_printCollate; }
+    int  GetOrientation() const { return m_printOrientation; }
+    bool IsOrientationReversed() const { return m_printOrientationReversed; }
 
     // 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; }
@@ -198,10 +193,12 @@ public:
     wxPrintQuality GetQuality() const { return m_printQuality; }
     wxPrintBin GetBin() const { return m_bin; }
     wxPrintMode GetPrintMode() const { return m_printMode; }
+    int GetMedia() const { return m_media; }
 
-    void SetNoCopies(int v) { m_printNoCopies = v; };
-    void SetCollate(bool flag) { m_printCollate = flag; };
-    void SetOrientation(int orient) { m_printOrientation = orient; };
+    void SetNoCopies(int v) { m_printNoCopies = v; }
+    void SetCollate(bool flag) { m_printCollate = flag; }
+    void SetOrientation(int orient) { m_printOrientation = orient; }
+    void SetOrientationReversed(bool reversed) { m_printOrientationReversed = reversed; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }
     void SetColour(bool colour) { m_colour = colour; }
@@ -210,13 +207,19 @@ public:
     void SetPaperSize(const wxSize& sz) { m_paperSize = sz; }
     void SetQuality(wxPrintQuality quality) { m_printQuality = quality; }
     void SetBin(wxPrintBin bin) { m_bin = bin; }
+    void SetMedia(int media) { m_media = media; }
     void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; }
 
     wxString GetFilename() const { return m_filename; }
     void SetFilename( const wxString &filename ) { m_filename = filename; }
-    
+
     void operator=(const wxPrintData& data);
 
+    char* GetPrivData() const { return m_privData; }
+    int GetPrivDataLen() const { return m_privDataLen; }
+    void SetPrivData( char *privData, int len );
+
+
 #if WXWIN_COMPATIBILITY_2_4
     // PostScript-specific data
     wxString GetPrinterCommand() const;
@@ -246,17 +249,14 @@ public:
     // Holds the native print data
     wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
-public:
-#if defined(__WXMAC__)
-    wxNativePrintData* m_nativePrintData ;
-#endif
-
 private:
     wxPrintBin      m_bin;
+    int             m_media;
     wxPrintMode     m_printMode;
 
     int             m_printNoCopies;
     int             m_printOrientation;
+    bool            m_printOrientationReversed;
     bool            m_printCollate;
 
     wxString        m_printerName;
@@ -265,9 +265,12 @@ private:
     wxPrintQuality  m_printQuality;
     wxPaperSize     m_paperId;
     wxSize          m_paperSize;
-    
+
     wxString        m_filename;
-    
+
+    char* m_privData;
+    int   m_privDataLen;
+
     wxPrintNativeDataBase  *m_nativeData;
 
 private:
@@ -287,7 +290,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; };
@@ -324,7 +327,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; }
@@ -332,11 +336,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;
@@ -373,7 +372,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(); };
@@ -391,7 +390,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.
@@ -415,11 +415,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();
@@ -431,7 +426,8 @@ public:
     wxPageSetupDialogData& operator=(const wxPrintData& data);
 
     wxPrintData& GetPrintData() { return m_printData; }
-    void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
+    const wxPrintData& GetPrintData() const { return m_printData; }
+    void SetPrintData(const wxPrintData& printData);
 
 private:
     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)