X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..bd0df01f3f59940fdbca7a3472c256be2d034ab9:/src/common/cmndata.cpp diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 100112b331..19d2589a38 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -29,7 +29,7 @@ #include "wx/gdicmn.h" #include "wx/cmndata.h" -#ifdef __WINDOWS__ +#ifdef __WXMSW__ #include #ifndef __WIN32__ @@ -127,7 +127,7 @@ void wxFontData::operator=(const wxFontData& data) wxPrintData::wxPrintData(void) { -#ifdef __WINDOWS__ +#ifdef __WXMSW__ printData = NULL; #endif printOrientation = wxPORTRAIT; @@ -148,7 +148,7 @@ wxPrintData::wxPrintData(void) wxPrintData::~wxPrintData(void) { -#ifdef __WINDOWS__ +#ifdef __WXMSW__ PRINTDLG *pd = (PRINTDLG *)printData; if ( pd && pd->hDevMode ) GlobalFree(pd->hDevMode); @@ -157,7 +157,7 @@ wxPrintData::~wxPrintData(void) #endif } -#ifdef __WINDOWS__ +#ifdef __WXMSW__ void wxPrintData::ConvertToNative(void) { PRINTDLG *pd = (PRINTDLG*) printData; @@ -215,7 +215,7 @@ void wxPrintData::ConvertToNative(void) pd->Flags = PD_RETURNDC ; // pd->lStructSize = sizeof( PRINTDLG ); pd->lStructSize = 66 ; - pd->hwndOwner=(HANDLE)NULL; + pd->hwndOwner=(HWND)NULL; pd->hDevNames=(HANDLE)NULL; pd->hInstance=(HINSTANCE)NULL; pd->lCustData = (LPARAM) NULL; @@ -387,7 +387,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;