#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(__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);
~wxColourData();
- void SetChooseFull(bool flag) { chooseFull = flag; }
- bool GetChooseFull() const { return chooseFull; }
- void SetColour(const wxColour& colour) { dataColour = colour; }
- const wxColour& GetColour() const { return dataColour; }
- wxColour& GetColour() { return dataColour; }
+ void SetChooseFull(bool flag) { m_chooseFull = flag; }
+ bool GetChooseFull() const { return m_chooseFull; }
+ void SetColour(const wxColour& colour) { m_dataColour = colour; }
+ const wxColour& GetColour() const { return m_dataColour; }
+ wxColour& GetColour() { return m_dataColour; }
// Array of 16 custom colours
void SetCustomColour(int i, const wxColour& colour);
void operator=(const wxColourData& data);
public:
- wxColour dataColour;
- wxColour custColours[16];
- bool chooseFull;
+ wxColour m_dataColour;
+ wxColour m_custColours[16];
+ bool m_chooseFull;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxColourData)
};
class WXDLLEXPORT wxFontData: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxFontData)
public:
wxFontData();
~wxFontData();
wxFontData(const wxFontData& data)
: wxObject()
- , fontColour(data.fontColour)
- , showHelp(data.showHelp)
- , allowSymbols(data.allowSymbols)
- , enableEffects(data.enableEffects)
- , initialFont(data.initialFont)
- , chosenFont(data.chosenFont)
- , minSize(data.minSize)
- , maxSize(data.maxSize)
+ , 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)
{
wxFontData& operator=(const wxFontData& data)
{
wxObject::operator=(data);
- fontColour = data.fontColour;
- showHelp = data.showHelp;
- allowSymbols = data.allowSymbols;
- enableEffects = data.enableEffects;
- initialFont = data.initialFont;
- chosenFont = data.chosenFont;
- minSize = data.minSize;
- maxSize = data.maxSize;
+ 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;
return *this;
}
- void SetAllowSymbols(bool flag) { allowSymbols = flag; }
- bool GetAllowSymbols() const { return allowSymbols; }
+ void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
+ bool GetAllowSymbols() const { return m_allowSymbols; }
- void SetColour(const wxColour& colour) { fontColour = colour; }
- wxColour &GetColour() { return fontColour; }
+ void SetColour(const wxColour& colour) { m_fontColour = colour; }
+ wxColour &GetColour() { return m_fontColour; }
- void SetShowHelp(bool flag) { showHelp = flag; }
- bool GetShowHelp() const { return showHelp; }
+ void SetShowHelp(bool flag) { m_showHelp = flag; }
+ bool GetShowHelp() const { return m_showHelp; }
- void EnableEffects(bool flag) { enableEffects = flag; }
- bool GetEnableEffects() const { return enableEffects; }
+ void EnableEffects(bool flag) { m_enableEffects = flag; }
+ bool GetEnableEffects() const { return m_enableEffects; }
- void SetInitialFont(const wxFont& font) { initialFont = font; }
- wxFont GetInitialFont() const { return initialFont; }
+ void SetInitialFont(const wxFont& font) { m_initialFont = font; }
+ wxFont GetInitialFont() const { return m_initialFont; }
- void SetChosenFont(const wxFont& font) { chosenFont = font; }
- wxFont GetChosenFont() const { return chosenFont; }
+ void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
+ wxFont GetChosenFont() const { return m_chosenFont; }
- void SetRange(int minRange, int maxRange) { minSize = minRange; maxSize = maxRange; }
+ void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }
// encoding info is split into 2 parts: the logical wxWin encoding
// (wxFontEncoding) and a structure containing the native parameters for
wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
public:
- wxColour fontColour;
- bool showHelp;
- bool allowSymbols;
- bool enableEffects;
- wxFont initialFont;
- wxFont chosenFont;
- int minSize;
- int maxSize;
+ wxColour m_fontColour;
+ bool m_showHelp;
+ bool m_allowSymbols;
+ bool m_enableEffects;
+ wxFont m_initialFont;
+ wxFont m_chosenFont;
+ int m_minSize;
+ int m_maxSize;
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(__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
projects / wxWidgets.git / blobdiff