fixed 2 encoding handling bugs in XRC/wxrcedit

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 9570bfb9feb38d26e2fb5fa12452e9316528fd30..1e72c149f79b68f0a947dc430ebdfc1e35ff0388 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,13 +1,36 @@
-#ifndef __PRINTDLGH_BASE__
-#define __PRINTDLGH_BASE__
+#ifndef _WX_PRINTDLG_H_BASE_
+#define _WX_PRINTDLG_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXUNIVERSAL__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/printdlg.h"
 #include "wx/msw/printdlg.h"

-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXGTK__)
+#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__)

 #include "wx/generic/prntdlgg.h"
 #include "wx/generic/prntdlgg.h"

-#elif defined(__GTK__)
+#elif defined(__WXSTUBS__)

 #include "wx/generic/prntdlgg.h"
 #endif
 
 #include "wx/generic/prntdlgg.h"
 #endif
 

+#if defined(__WXUNIVERSAL__) || (!defined(__WXMSW__) && !defined(__WXMAC__))
+#define wxPrintDialog wxGenericPrintDialog
+#define sm_classwxPrintDialog sm_classwxGenericPrintDialog
+
+#define wxPrintSetupDialog wxGenericPrintSetupDialog
+#define sm_classwxPrintSetupDialog sm_classwxGenericPrintSetupDialog
+
+#define wxPageSetupDialog wxGenericPageSetupDialog
+#define sm_classwxPageSetupDialog sm_classwxGenericPageSetupDialog
+#endif
+

 #endif
 #endif

-    // __PRINTDLGH_BASE__
+    // _WX_PRINTDLG_H_BASE_