projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SourceForge patch #654210 to fix naming/numbering shared libs under OS X
[wxWidgets.git]
/
include
/
wx
/
printdlg.h
diff --git
a/include/wx/printdlg.h
b/include/wx/printdlg.h
index e92e2f52f405ea55704c9ed8c725b6482e935432..1e72c149f79b68f0a947dc430ebdfc1e35ff0388 100644
(file)
--- a/
include/wx/printdlg.h
+++ b/
include/wx/printdlg.h
@@
-1,7
+1,9
@@
#ifndef _WX_PRINTDLG_H_BASE_
#define _WX_PRINTDLG_H_BASE_
#ifndef _WX_PRINTDLG_H_BASE_
#define _WX_PRINTDLG_H_BASE_
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMSW__)
#include "wx/msw/printdlg.h"
#elif defined(__WXMOTIF__)
#include "wx/generic/prntdlgg.h"
#include "wx/msw/printdlg.h"
#elif defined(__WXMOTIF__)
#include "wx/generic/prntdlgg.h"
@@
-9,6
+11,8
@@
#include "wx/generic/prntdlgg.h"
#elif defined(__WXX11__)
#include "wx/generic/prntdlgg.h"
#include "wx/generic/prntdlgg.h"
#elif defined(__WXX11__)
#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMGL__)
+#include "wx/generic/prntdlgg.h"
#elif defined(__WXMAC__)
#include "wx/mac/printdlg.h"
#elif defined(__WXPM__)
#elif defined(__WXMAC__)
#include "wx/mac/printdlg.h"
#elif defined(__WXPM__)
@@
-17,7
+21,7
@@
#include "wx/generic/prntdlgg.h"
#endif
#include "wx/generic/prntdlgg.h"
#endif
-#if
!defined(__WXMSW__) && !defined(__WXMAC__
)
+#if
defined(__WXUNIVERSAL__) || (!defined(__WXMSW__) && !defined(__WXMAC__)
)
#define wxPrintDialog wxGenericPrintDialog
#define sm_classwxPrintDialog sm_classwxGenericPrintDialog
#define wxPrintDialog wxGenericPrintDialog
#define sm_classwxPrintDialog sm_classwxGenericPrintDialog