X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6038ec8eafaf9bab7adf9af4fcc7a5af61bee00a..6bd719f16c64ac2757a40782b709d30e810d2eff:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index b108d557ac..d533e84546 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" @@ -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, @@ -182,9 +174,9 @@ public: wxPrintData(const wxPrintData& printData); ~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; } // Is this data OK for showing the print dialog? bool Ok() const ; @@ -199,9 +191,9 @@ public: wxPrintBin GetBin() const { return m_bin; } wxPrintMode GetPrintMode() const { return m_printMode; } - 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 SetPrinterName(const wxString& name) { m_printerName = name; } void SetColour(bool colour) { m_colour = colour; } @@ -216,18 +208,40 @@ public: void SetFilename( const wxString &filename ) { m_filename = filename; } void operator=(const wxPrintData& data); - - wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; } -#if defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); + 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; + wxString GetPrinterOptions() const; + wxString GetPreviewCommand() const; + wxString GetFontMetricPath() const; + double GetPrinterScaleX() const; + double GetPrinterScaleY() const; + long GetPrinterTranslateX() const; + long GetPrinterTranslateY() const; + + void SetPrinterCommand(const wxString& command); + void SetPrinterOptions(const wxString& options); + void SetPreviewCommand(const wxString& command); + void SetFontMetricPath(const wxString& path); + void SetPrinterScaleX(double x); + void SetPrinterScaleY(double y); + void SetPrinterScaling(double x, double y); + void SetPrinterTranslateX(long x); + void SetPrinterTranslateY(long y); + void SetPrinterTranslation(long x, long y); #endif -public: -#if defined(__WXMAC__) - wxNativePrintData* m_nativePrintData ; -#endif + // Convert between wxPrintData and native data + void ConvertToNative(); + void ConvertFromNative(); + // Holds the native print data + wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; } private: wxPrintBin m_bin; @@ -246,6 +260,9 @@ private: wxString m_filename; + char* m_privData; + int m_privDataLen; + wxPrintNativeDataBase *m_nativeData; private: @@ -276,8 +293,9 @@ public: bool GetSelection() const { return m_printSelection; }; bool GetCollate() const { return m_printCollate; }; bool GetPrintToFile() const { return m_printToFile; }; +#if WXWIN_COMPATIBILITY_2_4 bool GetSetupDialog() const { return m_printSetupDialog; }; - +#endif void SetFromPage(int v) { m_printFromPage = v; }; void SetToPage(int v) { m_printToPage = v; }; void SetMinPage(int v) { m_printMinPage = v; }; @@ -287,8 +305,9 @@ public: void SetSelection(bool flag) { m_printSelection = flag; }; void SetCollate(bool flag) { m_printCollate = flag; }; void SetPrintToFile(bool flag) { m_printToFile = flag; }; +#if WXWIN_COMPATIBILITY_2_4 void SetSetupDialog(bool flag) { m_printSetupDialog = flag; }; - +#endif void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; }; void EnableSelection(bool flag) { m_printEnableSelection = flag; }; void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; }; @@ -308,21 +327,6 @@ public: void operator=(const wxPrintDialogData& data); void operator=(const wxPrintData& data); // Sets internal m_printData member -#ifdef __WXMSW__ - // Convert to/from the PRINTDLG structure - void ConvertToNative(); - void ConvertFromNative(); - void SetOwnerWindow(wxWindow* win); - void* GetNativeData() const { return m_printDlgData; } -#elif defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); -#endif - -#ifdef __WXMSW__ - void* m_printDlgData; -#endif - private: int m_printFromPage; int m_printToPage; @@ -337,7 +341,9 @@ private: bool m_printEnablePageNumbers; bool m_printEnableHelp; bool m_printEnablePrintToFile; +#if WXWIN_COMPATIBILITY_2_4 bool m_printSetupDialog; +#endif wxPrintData m_printData; private: @@ -399,17 +405,6 @@ public: void EnablePrinter(bool flag) { m_enablePrinter = flag; }; void EnableHelp(bool flag) { m_enableHelp = flag; }; -#if defined(__WIN95__) - // Convert to/from the PAGESETUPDLG structure - void ConvertToNative(); - void ConvertFromNative(); - void SetOwnerWindow(wxWindow* win); - void* GetNativeData() const { return m_pageSetupData; } -#elif defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); -#endif - // Use paper size defined in this object to set the wxPrintData // paper id void CalculateIdFromPaperSize(); @@ -421,11 +416,7 @@ public: wxPageSetupDialogData& operator=(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } - void SetPrintData(const wxPrintData& printData) { m_printData = printData; } - -#if defined(__WIN95__) - void* m_pageSetupData; -#endif + void SetPrintData(const wxPrintData& printData); private: wxSize m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)