several fixes

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index ed5480759488e1c4f214104545f5bfc094074ffe..9f0da1d25f2e9fe458d2bbbdfea57cb61fe3e75c 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -20,10 +20,12 @@
 #pragma hdrstop
 #endif
 
-// #define __GOOD_COMPILER__
-
 #include "wx/defs.h"
 
+#ifdef __WXMSW__
+#define __GOOD_COMPILER__
+#endif
+
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"
@@ -45,7 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #include <commdlg.h>
 
@@ -75,7 +77,7 @@ typedef signed short int SHORT ;
 
 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 #endif
- // End __WINDOWS__
+ // End __WXMSW__
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
@@ -146,9 +148,9 @@ void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout)
  * Printout class
  */
  
-wxPrintout::wxPrintout(char *title)
+wxPrintout::wxPrintout(const char *title)
 {
-  printoutTitle = title ? copystring(title) : (char*)NULL;
+  printoutTitle = title ? copystring(title) : NULL;
   printoutDC = NULL;
   pageWidthMM = 0;
   pageHeightMM = 0;
@@ -335,7 +337,7 @@ void wxPreviewControlBar::CreateButtons(void)
 
   SetSize(0, 0, 400, 40);
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   int fontSize = 9;
 #else
   int fontSize = 10;
@@ -482,7 +484,7 @@ void wxPreviewFrame::Initialize(void)
 //  int w, h;
 //  controlBar->GetSize(&w, &h);
   int h;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   h = 40;
 #else
   h = 60;