#ifdef __WXMSW__
#include <windows.h>
- #include <wx/msw/private.h>
+ #include "wx/msw/private.h"
#if !defined(__WIN32__)
#include <print.h>
#endif
#endif // MSW
-#if !USE_SHARED_LIBRARY
#if wxUSE_PRINTING_ARCHITECTURE
IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
#endif // wxUSE_PRINTING_ARCHITECTURE
+
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
-#endif
+
+#ifdef __WXMAC__
+ #define mm2pt 2.83464566929
+ #define pt2mm 0.352777777778
+#endif // Mac
// ============================================================================
// implementation
enableEffects = TRUE;
minSize = 0;
maxSize = 0;
-}
-wxFontData::wxFontData(const wxFontData& data)
-{
- (*this) = data;
+ m_encoding = wxFONTENCODING_SYSTEM;
}
wxFontData::~wxFontData()
{
}
-void wxFontData::operator=(const wxFontData& data)
-{
- fontColour = data.fontColour;
- showHelp = data.showHelp;
- allowSymbols = data.allowSymbols;
- enableEffects = data.enableEffects;
- initialFont = data.initialFont;
- chosenFont = data.chosenFont;
- minSize = data.minSize;
- maxSize = data.maxSize;
-}
-
#if wxUSE_PRINTING_ARCHITECTURE
// ----------------------------------------------------------------------------
// Print data
wxPrintData::wxPrintData()
{
#ifdef __WXMSW__
- m_devMode = NULL;
+ m_devMode = (void*) NULL;
+ m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+ m_macPrintInfo = NULL ;
#endif
m_printOrientation = wxPORTRAIT;
m_printNoCopies = 1;
wxPrintData::wxPrintData(const wxPrintData& printData)
{
#ifdef __WXMSW__
- m_devMode = NULL;
+ m_devMode = (void*) NULL;
+ m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+ m_macPrintInfo = NULL ;
#endif
-
(*this) = printData;
}
{
#ifdef __WXMSW__
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
- if (hDevMode )
+ if ( hDevMode )
GlobalFree(hDevMode);
+ HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+ if ( hDevNames )
+ GlobalFree(hDevNames);
+#elif defined(__WXMAC__)
+ if ( m_macPrintInfo )
+ ::DisposeHandle( (Handle) m_macPrintInfo ) ;
#endif
}
#if defined(__WXMSW__) // && defined(__WIN32__)
-#ifdef __WIN32__
+#if defined(__WXDEBUG__) && defined(__WIN32__)
static wxString wxGetPrintDlgError()
{
DWORD err = CommDlgExtendedError();
- wxString msg = T("Unknown");
+ wxString msg = wxT("Unknown");
switch (err)
{
- case CDERR_FINDRESFAILURE: msg = T("CDERR_FINDRESFAILURE"); break;
- case CDERR_INITIALIZATION: msg = T("CDERR_INITIALIZATION"); break;
- case CDERR_LOADRESFAILURE: msg = T("CDERR_LOADRESFAILURE"); break;
- case CDERR_LOADSTRFAILURE: msg = T("CDERR_LOADSTRFAILURE"); break;
- case CDERR_LOCKRESFAILURE: msg = T("CDERR_LOCKRESFAILURE"); break;
- case CDERR_MEMALLOCFAILURE: msg = T("CDERR_MEMALLOCFAILURE"); break;
- case CDERR_MEMLOCKFAILURE: msg = T("CDERR_MEMLOCKFAILURE"); break;
- case CDERR_NOHINSTANCE: msg = T("CDERR_NOHINSTANCE"); break;
- case CDERR_NOHOOK: msg = T("CDERR_NOHOOK"); break;
- case CDERR_NOTEMPLATE: msg = T("CDERR_NOTEMPLATE"); break;
- case CDERR_STRUCTSIZE: msg = T("CDERR_STRUCTSIZE"); break;
- case PDERR_RETDEFFAILURE: msg = T("PDERR_RETDEFFAILURE"); break;
- case PDERR_PRINTERNOTFOUND: msg = T("PDERR_PRINTERNOTFOUND"); break;
- case PDERR_PARSEFAILURE: msg = T("PDERR_PARSEFAILURE"); break;
- case PDERR_NODEVICES: msg = T("PDERR_NODEVICES"); break;
- case PDERR_NODEFAULTPRN: msg = T("PDERR_NODEFAULTPRN"); break;
- case PDERR_LOADDRVFAILURE: msg = T("PDERR_LOADDRVFAILURE"); break;
- case PDERR_INITFAILURE: msg = T("PDERR_INITFAILURE"); break;
- case PDERR_GETDEVMODEFAIL: msg = T("PDERR_GETDEVMODEFAIL"); break;
- case PDERR_DNDMMISMATCH: msg = T("PDERR_DNDMMISMATCH"); break;
- case PDERR_DEFAULTDIFFERENT: msg = T("PDERR_DEFAULTDIFFERENT("); break;
- case PDERR_CREATEICFAILURE: msg = T("PDERR_CREATEICFAILURE"); break;
+ case CDERR_FINDRESFAILURE: msg = wxT("CDERR_FINDRESFAILURE"); break;
+ case CDERR_INITIALIZATION: msg = wxT("CDERR_INITIALIZATION"); break;
+ case CDERR_LOADRESFAILURE: msg = wxT("CDERR_LOADRESFAILURE"); break;
+ case CDERR_LOADSTRFAILURE: msg = wxT("CDERR_LOADSTRFAILURE"); break;
+ case CDERR_LOCKRESFAILURE: msg = wxT("CDERR_LOCKRESFAILURE"); break;
+ case CDERR_MEMALLOCFAILURE: msg = wxT("CDERR_MEMALLOCFAILURE"); break;
+ case CDERR_MEMLOCKFAILURE: msg = wxT("CDERR_MEMLOCKFAILURE"); break;
+ case CDERR_NOHINSTANCE: msg = wxT("CDERR_NOHINSTANCE"); break;
+ case CDERR_NOHOOK: msg = wxT("CDERR_NOHOOK"); break;
+ case CDERR_NOTEMPLATE: msg = wxT("CDERR_NOTEMPLATE"); break;
+ case CDERR_STRUCTSIZE: msg = wxT("CDERR_STRUCTSIZE"); break;
+ case PDERR_RETDEFFAILURE: msg = wxT("PDERR_RETDEFFAILURE"); break;
+ case PDERR_PRINTERNOTFOUND: msg = wxT("PDERR_PRINTERNOTFOUND"); break;
+ case PDERR_PARSEFAILURE: msg = wxT("PDERR_PARSEFAILURE"); break;
+ case PDERR_NODEVICES: msg = wxT("PDERR_NODEVICES"); break;
+ case PDERR_NODEFAULTPRN: msg = wxT("PDERR_NODEFAULTPRN"); break;
+ case PDERR_LOADDRVFAILURE: msg = wxT("PDERR_LOADDRVFAILURE"); break;
+ case PDERR_INITFAILURE: msg = wxT("PDERR_INITFAILURE"); break;
+ case PDERR_GETDEVMODEFAIL: msg = wxT("PDERR_GETDEVMODEFAIL"); break;
+ case PDERR_DNDMMISMATCH: msg = wxT("PDERR_DNDMMISMATCH"); break;
+ case PDERR_DEFAULTDIFFERENT: msg = wxT("PDERR_DEFAULTDIFFERENT"); break;
+ case PDERR_CREATEICFAILURE: msg = wxT("PDERR_CREATEICFAILURE"); break;
default: break;
}
return msg;
}
#endif
+static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+{
+ HGLOBAL hDev = NULL;
+ // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
+ if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+ {
+ }
+ else
+ {
+ hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
+ driverName.Length() + 1 +
+ printerName.Length() + 1 +
+ portName.Length()+1);
+ LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
+ lpDev->wDriverOffset = sizeof(WORD)*4;
+ wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
+
+ lpDev->wDeviceOffset = (WORD)(lpDev->wDriverOffset + driverName.Length()+1);
+ wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
+
+ lpDev->wOutputOffset = (WORD)(lpDev->wDeviceOffset + printerName.Length()+1);
+ wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
+
+ lpDev->wDefault = 0;
+
+ GlobalUnlock(hDev);
+ }
+ return hDev;
+}
+
void wxPrintData::ConvertToNative()
{
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+ HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if (!hDevMode)
{
// Use PRINTDLG as a way of creating a DEVMODE object
pd->hDevNames = NULL;
#if defined(__WXDEBUG__) && defined(__WIN32__)
- wxString str(T("Printing error: "));
+ wxString str(wxT("Printing error: "));
str += wxGetPrintDlgError();
wxLogDebug(str);
#endif
}
else
{
+ hDevMode = pd->hDevMode;
+ m_devMode = (void*)(long) hDevMode;
+ pd->hDevMode = NULL;
+
+ // We'll create a new DEVNAMEs structure below.
if ( pd->hDevNames )
GlobalFree(pd->hDevNames);
pd->hDevNames = NULL;
- hDevMode = pd->hDevMode;
- m_devMode = (void*)(long) hDevMode;
- pd->hDevMode = NULL;
+ // hDevNames = pd->hDevNames;
+ // m_devNames = (void*)(long) hDevNames;
+ // pd->hDevnames = NULL;
+
}
delete pd;
if ( hDevMode )
{
- DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
+ LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
//// Orientation
//// Printer name
- if (m_printerName != T(""))
+ if (m_printerName != wxT(""))
{
// TODO: make this Unicode compatible
int len = wxMin(31, m_printerName.Len());
GlobalUnlock(hDevMode);
}
+
+ if ( hDevNames )
+ {
+ GlobalFree(hDevNames);
+ }
+
+ // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
+ hDevNames = wxCreateDevNames("", m_printerName, "");
}
void wxPrintData::ConvertFromNative()
{
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+ HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if (!hDevMode)
return;
if ( hDevMode )
{
- DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
+ LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
#ifndef __WXWINE__
//// Orientation
else
{
// Shouldn't really get here
- wxFAIL_MSG(T("Couldn't find paper size in paper database."));
+ wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
m_paperId = wxPAPER_NONE;
m_paperSize.x = 0;
else
{
// Shouldn't really get here
- wxFAIL_MSG(T("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+ wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
m_paperId = wxPAPER_NONE;
m_paperSize.x = 0;
else
{
// Shouldn't really get here
- wxFAIL_MSG(T("Couldn't find paper size from DEVMODE."));
+ wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
m_paperSize.x = 0;
m_paperSize.y = 0;
GlobalUnlock(hDevMode);
}
+
+ if (hDevNames)
+ {
+ LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
+ if (lpDevNames)
+ {
+ // TODO: Unicode-ification
+
+ // Get the port name
+ // port is obsolete in WIN32
+ // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+
+ // Get the printer name
+ wxString printerName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
+
+ // 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 != "")
+ m_printerName = printerName;
+
+ GlobalUnlock(hDevNames);
+ }
+ }
+}
+
+#endif
+
+#ifdef __WXMAC__
+void wxPrintData::ConvertToNative()
+{
+ if ( !m_macPrintInfo )
+ {
+ m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
+ if ( m_macPrintInfo )
+ {
+ ::PrintDefault( m_macPrintInfo ) ;
+ // todo setup the global pagesetup ?
+ }
+ }
+ if ( m_macPrintInfo )
+ {
+ (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+ (**m_macPrintInfo).prJob.iFstPage = 0 ;
+ (**m_macPrintInfo).prJob.iLstPage = 0 ;
+ }
}
+void wxPrintData::ConvertFromNative()
+{
+ if ( m_macPrintInfo )
+ {
+ m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+ }
+}
#endif
void wxPrintData::operator=(const wxPrintData& data)
{
#ifdef __WXMSW__
m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPrintInfo = NULL ;
#endif
m_printFromPage = 0;
m_printToPage = 0;
wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
{
+#ifdef __WXMSW__
+ m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPrintInfo = NULL ;
+#endif
(*this) = dialogData;
}
{
#ifdef __WXMSW__
m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPrintInfo = NULL ;
#endif
m_printFromPage = 0;
m_printToPage = 0;
GlobalFree(pd->hDevMode);
if ( pd )
delete pd;
+#elif defined(__WXMAC__)
+ if ( m_macPrintInfo )
+ ::DisposeHandle( (Handle) m_macPrintInfo ) ;
#endif
}
GlobalFree(pd->hDevMode);
}
+ // Pass the devnames data to the PRINTDLG structure, since it'll
+ // be needed when PrintDlg is called.
+ if (pd->hDevNames)
+ {
+ GlobalFree(pd->hDevNames);
+ }
+
pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();
m_printData.SetNativeData((void*) NULL);
- wxASSERT_MSG( (pd->hDevMode), T("hDevMode must be non-NULL in ConvertToNative!"));
+ wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+ pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
+
+ m_printData.SetNativeDataDevNames((void*) NULL);
pd->hDC = (HDC) NULL;
pd->nFromPage = (UINT)m_printFromPage;
#endif
pd->hwndOwner=(HWND)NULL;
- pd->hDevNames=(HANDLE)NULL;
+// pd->hDevNames=(HANDLE)NULL;
pd->hInstance=(HINSTANCE)NULL;
pd->lCustData = (LPARAM) NULL;
pd->lpfnPrintHook = NULL;
pd->hDevMode = NULL;
}
+ // Pass the devnames data back to the wxPrintData structure where it really belongs.
+ if (pd->hDevNames)
+ {
+ if (m_printData.GetNativeDataDevNames())
+ {
+ // Make sure we don't leak memory
+ GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames());
+ }
+ m_printData.SetNativeDataDevNames((void*)(long) pd->hDevNames);
+ pd->hDevNames = NULL;
+ }
+
// Now convert the DEVMODE object, passed down from the PRINTDLG object,
// into wxWindows form.
m_printData.ConvertFromNative();
}
#endif // MSW
+#ifdef __WXMAC__
+void wxPrintDialogData::ConvertToNative()
+{
+ if ( !m_macPrintInfo )
+ {
+ m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
+ if ( m_macPrintInfo )
+ {
+ ::PrintDefault( m_macPrintInfo ) ;
+ // todo setup the global pagesetup ?
+ }
+ }
+ if ( m_macPrintInfo )
+ {
+ (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+ (**m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
+ (**m_macPrintInfo).prJob.iLstPage = m_printToPage ;
+ }
+}
+
+void wxPrintDialogData::ConvertFromNative()
+{
+ if ( m_macPrintInfo )
+ {
+ m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+ m_printFromPage = (**m_macPrintInfo).prJob.iFstPage ;
+ m_printToPage = (**m_macPrintInfo).prJob.iLstPage ;
+ }
+}
+#endif
+
+
void wxPrintDialogData::operator=(const wxPrintDialogData& data)
{
m_printFromPage = data.m_printFromPage;
{
#if defined(__WIN95__)
m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPageSetupInfo = NULL ;
#endif
m_paperSize = wxSize(0, 0);
wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
{
+#if defined(__WIN95__)
+ m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPageSetupInfo = NULL ;
+#endif
(*this) = dialogData;
}
{
#if defined(__WIN95__)
m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+ m_macPageSetupInfo = NULL ;
#endif
m_paperSize = wxSize(0, 0);
m_minMarginTopLeft = wxPoint(0, 0);
PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
if ( pd && pd->hDevMode )
GlobalFree(pd->hDevMode);
+ if ( pd && pd->hDevNames )
+ GlobalFree(pd->hDevNames);
if ( pd )
delete pd;
+#elif defined( __WXMAC__ )
+ if( m_macPageSetupInfo )
+ ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;
#endif
}
{
pd = new PAGESETUPDLG;
pd->hDevMode = NULL;
+ pd->hDevNames = NULL;
m_pageSetupData = (void *)pd;
}
m_printData.SetNativeData((void*) NULL);
- wxASSERT_MSG( (pd->hDevMode), T("hDevMode must be non-NULL in ConvertToNative!"));
+ wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+ // Pass the devnames data (created in m_printData.ConvertToNative)
+ // to the PRINTDLG structure, since it'll
+ // be needed when PrintDlg is called.
+
+ if (pd->hDevNames)
+ {
+ GlobalFree(pd->hDevNames);
+ pd->hDevNames = NULL;
+ }
+
+ pd->hDevNames = (HGLOBAL) m_printData.GetNativeDataDevNames();
+
+ m_printData.SetNativeDataDevNames((void*) NULL);
// pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
pd->lStructSize = sizeof( PAGESETUPDLG );
pd->hwndOwner=(HWND)NULL;
- pd->hDevNames=(HWND)NULL;
+// pd->hDevNames=(HWND)NULL;
pd->hInstance=(HINSTANCE)NULL;
pd->ptPaperSize.x = m_paperSize.x * 100;
m_printData.ConvertFromNative();
+ // Pass the devnames data back to the wxPrintData structure where it really belongs.
+ if (pd->hDevNames)
+ {
+ if (m_printData.GetNativeDataDevNames())
+ {
+ // Make sure we don't leak memory
+ GlobalFree((HGLOBAL) m_printData.GetNativeDataDevNames());
+ }
+ m_printData.SetNativeDataDevNames((void*) pd->hDevNames);
+ pd->hDevNames = NULL;
+ }
+
+ m_printData.ConvertFromNative();
+
pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
}
#endif // Win95
+#ifdef __WXMAC__
+void wxPageSetupDialogData::ConvertToNative()
+{
+ if ( !m_macPageSetupInfo )
+ {
+ m_macPageSetupInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
+ if ( m_macPageSetupInfo )
+ {
+ ::PrintDefault( m_macPageSetupInfo ) ;
+ }
+ }
+ if ( m_macPageSetupInfo )
+ {
+ // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
+ (**m_macPageSetupInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
+ (**m_macPageSetupInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
+
+ (**m_macPageSetupInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt ) ;
+ (**m_macPageSetupInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt ) ;
+
+ (**m_macPageSetupInfo).prInfo.rPage.left = 0 ;
+ (**m_macPageSetupInfo).prInfo.rPage.top = 0 ;
+ (**m_macPageSetupInfo).prInfo.rPage.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt ) ;
+ (**m_macPageSetupInfo).prInfo.rPage.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt ) ;
+
+ //TODO add custom fields in dialog for margins
+
+ }
+}
+
+void wxPageSetupDialogData::ConvertFromNative()
+{
+ if ( m_macPageSetupInfo )
+ {
+ m_paperSize.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
+ m_paperSize.y = ((double) (**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
+
+ m_minMarginTopLeft.x = ((double) -(**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
+ m_minMarginTopLeft.y = ((double) -(**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
+
+ m_minMarginBottomRight.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).prInfo.rPage.right ) * pt2mm ;
+ m_minMarginBottomRight.y = ((double)(**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).prInfo.rPage.bottom ) * pt2mm ;
+
+ // adjust minimal values
+ //TODO add custom fields in dialog for margins
+
+ if ( m_marginTopLeft.x < m_minMarginTopLeft.x )
+ m_marginTopLeft.x = m_minMarginTopLeft.x ;
+
+ if ( m_marginBottomRight.x < m_minMarginBottomRight.x )
+ m_marginBottomRight.x = m_minMarginBottomRight.x ;
+
+ if ( m_marginTopLeft.y < m_minMarginTopLeft.y )
+ m_marginTopLeft.y = m_minMarginTopLeft.y ;
+
+ if ( m_marginBottomRight.y < m_minMarginBottomRight.y )
+ m_marginBottomRight.y = m_minMarginBottomRight.y ;
+
+ }
+}
+#endif
+
+
// If a corresponding paper type is found in the paper database, will set the m_printData
// paper size id member as well.
void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
void wxPageSetupDialogData::CalculateIdFromPaperSize()
{
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
- T("wxThePrintPaperDatabase should not be NULL. "
+ wxT("wxThePrintPaperDatabase should not be NULL. "
"Do not create global print dialog data objects.") );
wxSize sz = GetPaperSize();
void wxPageSetupDialogData::CalculatePaperSizeFromId()
{
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
- T("wxThePrintPaperDatabase should not be NULL. "
+ wxT("wxThePrintPaperDatabase should not be NULL. "
"Do not create global print dialog data objects.") );
wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
projects / wxWidgets.git / blobdiff