wxOS2/OW warning and build fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/printos2.h b/include/wx/os2/printos2.h
index e5a7feeefc4fb5d191708953b76a72408a875328..bf026a06b2faf36d3726dcdb36eaa0b1845b04ae 100644 (file)
--- a/include/wx/os2/printos2.h
+++ b/include/wx/os2/printos2.h
@@ -14,21 +14,23 @@
 
 #include "wx/prntbase.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 /*
  * Represents the printer: manages printing a wxPrintout object
  */
 
 class WXDLLEXPORT wxOS2Printer: public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxOS2Printer)
+    DECLARE_DYNAMIC_CLASS(wxOS2Printer)
 
- public:
-  wxOS2Printer(wxPrintDialogData *data = NULL);
-  ~wxOS2Printer();
+public:
+    wxOS2Printer(wxPrintDialogData *data = NULL);
+    ~wxOS2Printer();
 
-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual wxDC* PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent);
 private:
 };
 
@@ -39,16 +41,18 @@ private:
 
 class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxOS2PrintPreview)
+    DECLARE_CLASS(wxOS2PrintPreview)
 
- public:
-  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
-  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data);
-  ~wxOS2PrintPreview();
+public:
+    wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
+    wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data);
+    ~wxOS2PrintPreview();
 
-  virtual bool Print(bool interactive);
-  virtual void DetermineScaling();
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
 };
 
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
 #endif
     // _WX_PRINT_H_

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 30106270a33f04d7fde7d5af1d057dda41625369..ad19c5331648be67daecf5520880f5c2d94812ed 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -150,10 +150,6 @@
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
-// Unicode is currently only fully supported under Windows NT/2000/XP
-// (Windows 9x doesn't support it and the programs compiled in Unicode mode
-// will not run under 9x -- but see wxUSE_UNICODE_MSLU below).
-//
 // Default is 0
 //
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
@@ -161,22 +157,6 @@
     #define wxUSE_UNICODE 0
 #endif
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
-// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#define wxUSE_UNICODE_MSLU 0
-
 // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
 // compiling the program in Unicode mode. More precisely, it will be possible
 // to construct wxString from a wide (Unicode) string and convert any wxString
@@ -489,20 +469,6 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
-// Use QuickTime
-//
-// Default is 0
-//
-// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
-#define wxUSE_QUICKTIME     0
-
-// Use DirectShow (requires linkage to strmiids.lib)
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    0
-
 // Use GStreamer for Unix (req a lot of dependancies)
 //
 // Default is 0