converted to 16 colors

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 6c2c6864a1360c83d632eafad669ff523fdbef30..178e58668c7882ca5e88df9b5024a42d0e7a3390 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -16,10 +16,12 @@
 #pragma interface "cmndata.h"
 #endif
 
 #pragma interface "cmndata.h"
 #endif
 

+#include "wx/window.h"

 #include "wx/font.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/colour.h"

+#include "wx/gdicmn.h"

 
 

-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 


@@ -154,11 +156,11 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
     void operator=(const wxPrintData& data);
 
     // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT

     void operator=(const wxPrintSetupData& setupData);
 #endif
 
     void operator=(const wxPrintSetupData& setupData);
 #endif
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     // Convert to/from the DEVMODE structure
     void ConvertToNative();
     void ConvertFromNative();
     // Convert to/from the DEVMODE structure
     void ConvertToNative();
     void ConvertFromNative();