Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxOS2/OW warning and build fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-23 15:41:50 +00:00
parent 45aee08b3b
commit 49fe461056
2 changed files with 18 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/os2/printos2.h
View File

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

34
include/wx/os2/setup0.h
View File

@@ -150,10 +150,6 @@
// defined as wchar_t, wxString will use Unicode internally. If you set this // 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. // 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 // Default is 0
// //
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
@@ -161,22 +157,6 @@
#define wxUSE_UNICODE 0 #define wxUSE_UNICODE 0
#endif #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 // 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 // compiling the program in Unicode mode. More precisely, it will be possible
// to construct wxString from a wide (Unicode) string and convert any wxString // to construct wxString from a wide (Unicode) string and convert any wxString
@@ -489,20 +469,6 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_MEDIACTRL 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) // Use GStreamer for Unix (req a lot of dependancies)
// //
// Default is 0 // Default is 0