Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 19d2589a387a2ec3dbdfc139b0fc6a4f2e2ac2b5..e32e8a0b31d9f9fe85337b62c1633acf053fcf04 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

+#include "wx/string.h"

 #include "wx/utils.h"
 #include "wx/app.h"
 #endif
 #include "wx/utils.h"
 #include "wx/app.h"
 #endif


@@ -331,7 +332,7 @@ wxPageSetupData::wxPageSetupData(void)
 
 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);
     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;
 }
 
   m_enableHelp = data.m_enableHelp;
 }
 

-#if defined(__WIN95__)
+#if defined(__WXMSW__) && defined(__WIN95__)

 void wxPageSetupData::ConvertToNative(void)
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
 void wxPageSetupData::ConvertToNative(void)
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;