Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cmndata.cpp
View File

@@ -475,7 +475,7 @@ void wxPrintData::ConvertToNative()
}
// TODO: I hope it's OK to pass some empty strings to DEVNAMES.
hDevNames = wxCreateDevNames("", m_printerName, "");
m_devNames = (void*) (long) wxCreateDevNames("", m_printerName, "");
}
void wxPrintData::ConvertFromNative()
@@ -668,7 +668,7 @@ void wxPrintData::ConvertFromNative()
// Not sure if we should check for this mismatch
// wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
if (printerName != "")
if (printerName != wxT(""))
m_printerName = printerName;
GlobalUnlock(hDevNames);