X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/600902562da4b1008c006a1d9daca40fc932b7ef..1b79dad4dc211c70f52f2ec864904855386f2aec:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 75eb6960fb..0b76205af7 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" @@ -26,12 +22,16 @@ #include "wx/stream.h" #endif + +class WXDLLEXPORT wxPrintNativeDataBase; + + 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; } @@ -54,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) { } @@ -86,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; } @@ -95,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; } @@ -119,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; @@ -143,12 +145,6 @@ private: * Encapsulates printer information (not printer dialog information) */ -#ifdef __WXMAC__ - -class wxNativePrintData ; - -#endif - enum wxPrintBin { wxPRINTBIN_DEFAULT, @@ -167,7 +163,7 @@ enum wxPrintBin wxPRINTBIN_CASSETTE, wxPRINTBIN_FORMSOURCE, - wxPRINTBIN_USER, + wxPRINTBIN_USER }; @@ -176,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; }; + 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; } @@ -193,10 +190,11 @@ public: // in wxPageSetupDialogData wxPrintQuality GetQuality() const { return m_printQuality; } 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; } @@ -205,89 +203,68 @@ public: void SetPaperSize(const wxSize& sz) { m_paperSize = sz; } void SetQuality(wxPrintQuality quality) { m_printQuality = quality; } void SetBin(wxPrintBin bin) { m_bin = bin; } + void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; } - // PostScript-specific data - const wxString& GetPrinterCommand() const { return m_printerCommand; } - const wxString& GetPrinterOptions() const { return m_printerOptions; } - const wxString& GetPreviewCommand() const { return m_previewCommand; } - const wxString& GetFilename() const { return m_filename; } - const wxString& GetFontMetricPath() const { return m_afmPath; } - double GetPrinterScaleX() const { return m_printerScaleX; } - double GetPrinterScaleY() const { return m_printerScaleY; } - long GetPrinterTranslateX() const { return m_printerTranslateX; } - long GetPrinterTranslateY() const { return m_printerTranslateY; } - wxPrintMode GetPrintMode() const { return m_printMode; } + wxString GetFilename() const { return m_filename; } + void SetFilename( const wxString &filename ) { m_filename = filename; } + + void operator=(const wxPrintData& data); - void SetPrinterCommand(const wxString& command) { m_printerCommand = command; } - void SetPrinterOptions(const wxString& options) { m_printerOptions = options; } - void SetPreviewCommand(const wxString& command) { m_previewCommand = command; } - void SetFilename(const wxString& filename) { m_filename = filename; } - void SetFontMetricPath(const wxString& path) { m_afmPath = path; } - void SetPrinterScaleX(double x) { m_printerScaleX = x; } - void SetPrinterScaleY(double y) { m_printerScaleY = y; } - void SetPrinterScaling(double x, double y) { m_printerScaleX = x; m_printerScaleY = y; } - void SetPrinterTranslateX(long x) { m_printerTranslateX = x; } - void SetPrinterTranslateY(long y) { m_printerTranslateY = y; } - void SetPrinterTranslation(long x, long y) { m_printerTranslateX = x; m_printerTranslateY = y; } - void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; } + char* GetPrivData() const { return m_privData; } + int GetPrivDataLen() const { return m_privDataLen; } + void SetPrivData( char *privData, int len ); + -#if wxUSE_STREAMS - wxOutputStream* GetOutputStream() { return m_outputstream; } - void SetOutputStream(wxOutputStream* outputstream) { m_outputstream = outputstream; } +#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 - void operator=(const wxPrintData& data); - -#if defined(__WXMSW__) - // Convert to/from the DEVMODE structure + // Convert between wxPrintData and native data void ConvertToNative(); void ConvertFromNative(); - void* GetNativeData() const { return m_devMode; } - void SetNativeData(void* data) { m_devMode = data; } - void* GetNativeDataDevNames() const { return m_devNames; } - void SetNativeDataDevNames(void* data) { m_devNames = data; } -#elif defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); -#endif - -public: -#if defined(__WXMSW__) - void* m_devMode; - void* m_devNames; -#elif defined(__WXMAC__) - wxNativePrintData* m_nativePrintData ; -#endif -#if wxUSE_STREAMS - wxOutputStream* m_outputstream; -#endif + // Holds the native print data + wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; } private: wxPrintBin m_bin; + wxPrintMode m_printMode; int m_printNoCopies; int m_printOrientation; bool m_printCollate; - // New members, 24/3/99 wxString m_printerName; bool m_colour; wxDuplexMode m_duplexMode; wxPrintQuality m_printQuality; wxPaperSize m_paperId; wxSize m_paperSize; - - // PostScript-specific data - wxString m_printerCommand; - wxString m_previewCommand; - wxString m_printerOptions; + wxString m_filename; - wxString m_afmPath; - double m_printerScaleX; - double m_printerScaleY; - long m_printerTranslateX; - long m_printerTranslateY; - wxPrintMode m_printMode; + + char* m_privData; + int m_privDataLen; + + wxPrintNativeDataBase *m_nativeData; private: DECLARE_DYNAMIC_CLASS(wxPrintData) @@ -306,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; }; @@ -317,8 +294,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; }; @@ -328,8 +306,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; }; @@ -341,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; } @@ -349,21 +329,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; @@ -378,7 +343,9 @@ private: bool m_printEnablePageNumbers; bool m_printEnableHelp; bool m_printEnablePrintToFile; +#if WXWIN_COMPATIBILITY_2_4 bool m_printSetupDialog; +#endif wxPrintData m_printData; private: @@ -398,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(); }; @@ -416,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. @@ -440,17 +408,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(); @@ -462,11 +419,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?)