#ifndef _WX_CMNDATA_H_BASE_
#define _WX_CMNDATA_H_BASE_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "cmndata.h"
#endif
#include "wx/colour.h"
#include "wx/gdicmn.h"
-#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
-class WXDLLEXPORT wxPrintSetupData;
-#endif
-
class WXDLLEXPORT wxColourData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxColourData)
public:
wxColourData();
wxColourData(const wxColourData& data);
wxColour dataColour;
wxColour custColours[16];
bool chooseFull;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxColourData)
};
class WXDLLEXPORT wxFontData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxFontData)
public:
wxFontData();
~wxFontData();
private:
wxFontEncoding m_encoding;
wxNativeEncodingInfo m_encodingInfo;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxFontData)
};
#if wxUSE_PRINTING_ARCHITECTURE
* Encapsulates printer information (not printer dialog information)
*/
+#ifdef __WXMAC__
+
+class wxNativePrintData ;
+
+#endif
+
class WXDLLEXPORT wxPrintData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxPrintData)
-
+public:
wxPrintData();
wxPrintData(const wxPrintData& printData);
~wxPrintData();
void operator=(const wxPrintData& data);
- // For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
- void operator=(const wxPrintSetupData& setupData);
-#endif
-
#if defined(__WXMSW__)
// Convert to/from the DEVMODE structure
void ConvertToNative();
void* m_devMode;
void* m_devNames;
#elif defined(__WXMAC__)
- void* m_macPageFormat ;
- void* m_macPrintSettings ;
+ wxNativePrintData* m_nativePrintData ;
#endif
private:
long m_printerTranslateX;
long m_printerTranslateY;
wxPrintMode m_printMode;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxPrintData)
};
/*
class WXDLLEXPORT wxPrintDialogData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
-
+public:
wxPrintDialogData();
wxPrintDialogData(const wxPrintDialogData& dialogData);
wxPrintDialogData(const wxPrintData& printData);
void SetOwnerWindow(wxWindow* win);
void* GetNativeData() const { return m_printDlgData; }
#elif defined(__WXMAC__)
- void ConvertToNative();
- void ConvertFromNative();
+ void ConvertToNative();
+ void ConvertFromNative();
#endif
#ifdef __WXMSW__
#endif
private:
-
int m_printFromPage;
int m_printToPage;
int m_printMinPage;
bool m_printEnableHelp;
bool m_printEnablePrintToFile;
bool m_printSetupDialog;
-
wxPrintData m_printData;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
};
/*
class WXDLLEXPORT wxPageSetupDialogData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
-
public:
wxPageSetupDialogData();
wxPageSetupDialogData(const wxPageSetupDialogData& dialogData);
void SetOwnerWindow(wxWindow* win);
void* GetNativeData() const { return m_pageSetupData; }
#elif defined(__WXMAC__)
- void ConvertToNative();
- void ConvertFromNative();
+ void ConvertToNative();
+ void ConvertFromNative();
#endif
// Use paper size defined in this object to set the wxPrintData
#endif
private:
-
wxSize m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)
wxPoint m_minMarginTopLeft;
wxPoint m_minMarginBottomRight;
wxPoint m_marginTopLeft;
wxPoint m_marginBottomRight;
-
- // Flags
bool m_defaultMinMargins;
bool m_enableMargins;
bool m_enableOrientation;
bool m_enablePrinter;
bool m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
bool m_enableHelp;
-
wxPrintData m_printData;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
};
#endif // wxUSE_PRINTING_ARCHITECTURE