Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index a33f276da2d5bffba3f7cae831017a28636f2bc5..382f937687f1483450b61bff51b2b9932eb69683 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -147,12 +147,6 @@ private:
  * Encapsulates printer information (not printer dialog information)
  */
 
  * Encapsulates printer information (not printer dialog information)
  */
 

-#ifdef __WXMAC__
-
-class wxNativePrintData ;
-
-#endif
-

 enum wxPrintBin
 {
     wxPRINTBIN_DEFAULT,
 enum wxPrintBin
 {
     wxPRINTBIN_DEFAULT,


@@ -182,9 +176,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 ;


@@ -199,9 +193,9 @@ public:
     wxPrintBin GetBin() const { return m_bin; }
     wxPrintMode GetPrintMode() const { return m_printMode; }
 
     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; }


@@ -217,6 +211,11 @@ public:
     
     void operator=(const wxPrintData& data);
 
     
     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;
 #if WXWIN_COMPATIBILITY_2_4
     // PostScript-specific data
     wxString GetPrinterCommand() const;


@@ -246,11 +245,6 @@ public:
     // Holds the native print data
     wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
     // Holds the native print data
     wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 

-public:
-#if defined(__WXMAC__)
-    wxNativePrintData* m_nativePrintData ;
-#endif
-

 private:
     wxPrintBin      m_bin;
     wxPrintMode     m_printMode;
 private:
     wxPrintBin      m_bin;
     wxPrintMode     m_printMode;


@@ -268,6 +262,9 @@ private:
     
     wxString        m_filename;
     
     
     wxString        m_filename;
     

+    char* m_privData;
+    int   m_privDataLen;
+    

     wxPrintNativeDataBase  *m_nativeData;
 
 private:
     wxPrintNativeDataBase  *m_nativeData;
 
 private:


@@ -332,11 +329,6 @@ 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
 

-#if defined(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-

 private:
     int             m_printFromPage;
     int             m_printToPage;
 private:
     int             m_printFromPage;
     int             m_printToPage;


@@ -415,11 +407,6 @@ 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(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-

     // Use paper size defined in this object to set the wxPrintData
     // paper id
     void CalculateIdFromPaperSize();
     // Use paper size defined in this object to set the wxPrintData
     // paper id
     void CalculateIdFromPaperSize();