Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 3aa0a3e0d2fbf70c5746f8a6e8305e5cfdebefc5..35cee4ff505baee15427da67ef751d55c84129ae 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -22,6 +22,14 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

+#if wxUSE_STREAMS
+#include "wx/stream.h"
+#endif
+
+
+class WXDLLEXPORT wxPrintNativeDataBase;
+
+

 class WXDLLEXPORT wxColourData: public wxObject
 {
 public:
 class WXDLLEXPORT wxColourData: public wxObject
 {
 public:


@@ -45,7 +53,7 @@ public:
     wxColour        m_dataColour;
     wxColour        m_custColours[16];
     bool            m_chooseFull;
     wxColour        m_dataColour;
     wxColour        m_custColours[16];
     bool            m_chooseFull;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxColourData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxColourData)
 };


@@ -86,7 +94,7 @@ public:
         m_encodingInfo = data.m_encodingInfo;
         return *this;
     }
         m_encodingInfo = data.m_encodingInfo;
         return *this;
     }

-                          
+

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


@@ -128,7 +136,7 @@ public:
 private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;
 private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxFontData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxFontData)
 };


@@ -145,6 +153,28 @@ class wxNativePrintData ;
 
 #endif
 
 
 #endif
 

+enum wxPrintBin
+{
+    wxPRINTBIN_DEFAULT,
+
+    wxPRINTBIN_ONLYONE,
+    wxPRINTBIN_LOWER,
+    wxPRINTBIN_MIDDLE,
+    wxPRINTBIN_MANUAL,
+    wxPRINTBIN_ENVELOPE,
+    wxPRINTBIN_ENVMANUAL,
+    wxPRINTBIN_AUTO,
+    wxPRINTBIN_TRACTOR,
+    wxPRINTBIN_SMALLFMT,
+    wxPRINTBIN_LARGEFMT,
+    wxPRINTBIN_LARGECAPACITY,
+    wxPRINTBIN_CASSETTE,
+    wxPRINTBIN_FORMSOURCE,
+
+    wxPRINTBIN_USER
+};
+
+

 class WXDLLEXPORT wxPrintData: public wxObject
 {
 public:
 class WXDLLEXPORT wxPrintData: public wxObject
 {
 public:


@@ -152,9 +182,9 @@ public:
     wxPrintData(const wxPrintData& printData);
     ~wxPrintData();
 
     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 ;
 
     // Is this data OK for showing the print dialog?
     bool Ok() const ;


@@ -166,10 +196,12 @@ public:
     const wxSize& GetPaperSize() const { return m_paperSize; } // Not used yet: confusable with paper size
                                                                       // in wxPageSetupDialogData
     wxPrintQuality GetQuality() const { return m_printQuality; }
     const wxSize& GetPaperSize() const { return m_paperSize; } // Not used yet: confusable with paper size
                                                                       // 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; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }
     void SetColour(bool colour) { m_colour = colour; }


@@ -177,81 +209,75 @@ public:
     void SetPaperId(wxPaperSize sizeId) { m_paperId = sizeId; }
     void SetPaperSize(const wxSize& sz) { m_paperSize = sz; }
     void SetQuality(wxPrintQuality quality) { m_printQuality = quality; }
     void SetPaperId(wxPaperSize sizeId) { m_paperId = sizeId; }
     void SetPaperSize(const wxSize& sz) { m_paperSize = sz; }
     void SetQuality(wxPrintQuality quality) { m_printQuality = quality; }

-
-    // 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; }
-
-    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 SetBin(wxPrintBin bin) { m_bin = bin; }

     void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; }
 
     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);
 
     void operator=(const wxPrintData& data);
 

-#if defined(__WXMSW__)
-    // Convert to/from the DEVMODE structure
+    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
+
+    // Convert between wxPrintData and native data

     void ConvertToNative();
     void ConvertFromNative();
     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
+    // Holds the native print data
+    wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }

 
 public:
 
 public:

-#if defined(__WXMSW__)
-    void*           m_devMode;
-    void*           m_devNames;
-#elif defined(__WXMAC__)
+#if defined(__WXMAC__)

     wxNativePrintData* m_nativePrintData ;
 #endif
 
 private:
     wxNativePrintData* m_nativePrintData ;
 #endif
 
 private:

+    wxPrintBin      m_bin;
+    wxPrintMode     m_printMode;

 
     int             m_printNoCopies;
     int             m_printOrientation;
     bool            m_printCollate;
 
 
     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;
     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_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)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintData)
 };


@@ -280,8 +306,9 @@ public:
     bool GetSelection() const { return m_printSelection; };
     bool GetCollate() const { return m_printCollate; };
     bool GetPrintToFile() const { return m_printToFile; };
     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; };
     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; };
     void SetFromPage(int v) { m_printFromPage = v; };
     void SetToPage(int v) { m_printToPage = v; };
     void SetMinPage(int v) { m_printMinPage = v; };


@@ -291,8 +318,9 @@ public:
     void SetSelection(bool flag) { m_printSelection = flag; };
     void SetCollate(bool flag) { m_printCollate = flag; };
     void SetPrintToFile(bool flag) { m_printToFile = flag; };
     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; };
     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; };
     void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; };
     void EnableSelection(bool flag) { m_printEnableSelection = flag; };
     void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; };


@@ -312,19 +340,9 @@ public:
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 

-#ifdef __WXMSW__
-    // Convert to/from the PRINTDLG structure
+#if defined(__WXMAC__)

     void ConvertToNative();
     void ConvertFromNative();
     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:
 #endif
 
 private:


@@ -341,10 +359,12 @@ private:
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;

+#if WXWIN_COMPATIBILITY_2_4

     bool            m_printSetupDialog;
     bool            m_printSetupDialog;

+#endif

     wxPrintData     m_printData;
 
     wxPrintData     m_printData;
 

-private:    
+private:

     DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
 };
 


@@ -403,13 +423,7 @@ public:
     void EnablePrinter(bool flag) { m_enablePrinter = flag; };
     void EnableHelp(bool flag) { m_enableHelp = flag; };
 
     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__)
+#if defined(__WXMAC__)

     void ConvertToNative();
     void ConvertFromNative();
 #endif
     void ConvertToNative();
     void ConvertFromNative();
 #endif


@@ -425,11 +439,7 @@ public:
     wxPageSetupDialogData& operator=(const wxPrintData& data);
 
     wxPrintData& GetPrintData() { return m_printData; }
     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?)
 
 private:
     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)


@@ -445,7 +455,7 @@ private:
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;
     wxPrintData     m_printData;
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;
     wxPrintData     m_printData;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
 };