projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxHTML src code indentation now conforms (more) to wxWin coding style
[wxWidgets.git]
/
include
/
wx
/
cmndata.h
diff --git
a/include/wx/cmndata.h
b/include/wx/cmndata.h
index 408d3827b1a4175cdda219e9e54c520452f7589c..7cfa51d570fa2b01807fad1e1ffed8132f422a0c 100644
(file)
--- a/
include/wx/cmndata.h
+++ b/
include/wx/cmndata.h
@@
-176,11
+176,19
@@
class WXDLLEXPORT wxPrintData: public wxObject
void ConvertFromNative();
void* GetNativeData() const { return m_devMode; }
void SetNativeData(void* data) { m_devMode = data; }
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:
#ifdef __WXMSW__
void* m_devMode;
#endif
public:
#ifdef __WXMSW__
void* m_devMode;
+ void* m_devNames;
+#elif defined( __WXMAC__ )
+ THPrint m_macPrintInfo ;
#endif
private:
#endif
private:
@@
-270,10
+278,15
@@
class WXDLLEXPORT wxPrintDialogData: public wxObject
void ConvertFromNative();
void SetOwnerWindow(wxWindow* win);
void* GetNativeData() const { return m_printDlgData; }
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
#ifdef __WXMSW__
void* m_printDlgData;
+#elif defined( __WXMAC__ )
+ THPrint m_macPrintInfo ;
#endif
private:
#endif
private:
@@
-356,6
+369,9
@@
public:
void ConvertFromNative();
void SetOwnerWindow(wxWindow* win);
void* GetNativeData() const { return m_pageSetupData; }
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
#endif
// Use paper size defined in this object to set the wxPrintData
@@
-373,6
+389,8
@@
public:
#if defined(__WIN95__)
void* m_pageSetupData;
#if defined(__WIN95__)
void* m_pageSetupData;
+#elif defined( __WXMAC__ )
+ THPrint m_macPageSetupInfo ;
#endif
private:
#endif
private: