Update for bitmap, image on scaling, transparancy,

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index e19b0aa7133b03c98f9fc0031a393e418ef0a1f4..e32e8a0b31d9f9fe85337b62c1633acf053fcf04 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
+#include "wx/string.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #endif
@@ -29,7 +30,7 @@
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 
 #ifndef __WIN32__
@@ -127,7 +128,7 @@ void wxFontData::operator=(const wxFontData& data)
 
 wxPrintData::wxPrintData(void)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     printData = NULL;
 #endif
     printOrientation = wxPORTRAIT;
@@ -148,7 +149,7 @@ wxPrintData::wxPrintData(void)
 
 wxPrintData::~wxPrintData(void)
 {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     PRINTDLG *pd = (PRINTDLG *)printData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);
@@ -157,7 +158,7 @@ wxPrintData::~wxPrintData(void)
 #endif
 }
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 void wxPrintData::ConvertToNative(void)
 {
     PRINTDLG *pd = (PRINTDLG*) printData;
@@ -331,7 +332,7 @@ wxPageSetupData::wxPageSetupData(void)
 
 wxPageSetupData::~wxPageSetupData(void)
 {
-#if defined(__WIN95__)
+#if defined(__WIN95__) && defined(__WXMSW__)
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);
@@ -358,7 +359,7 @@ void wxPageSetupData::operator=(const wxPageSetupData& data)
   m_enableHelp = data.m_enableHelp;
 }
 
-#if defined(__WIN95__)
+#if defined(__WXMSW__) && defined(__WIN95__)
 void wxPageSetupData::ConvertToNative(void)
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
@@ -387,7 +388,7 @@ void wxPageSetupData::ConvertToNative(void)
         pd->Flags |= PSD_SHOWHELP;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
-    pd->hwndOwner=(HANDLE)NULL;
+    pd->hwndOwner=(HWND)NULL;
     pd->hDevNames=(HWND)NULL;
     pd->hInstance=(HINSTANCE)NULL;