X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..520e470fdd0daef09c77938db642e4583933c90d:/src/common/cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index b3e4eb2c21..e32e8a0b31 100644
--- 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
@@ -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;