projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use const wxMBConv& instead of wxMBConv& in public methods so that it's possible...
[wxWidgets.git]
/
src
/
os2
/
dcprint.cpp
diff --git
a/src/os2/dcprint.cpp
b/src/os2/dcprint.cpp
index c6e79fdb526f449a54df047c8b92d9c08b427754..1c4a11c248532c2686c41a3b6f1a14321291d8e7 100644
(file)
--- a/
src/os2/dcprint.cpp
+++ b/
src/os2/dcprint.cpp
@@
-14,13
+14,13
@@
#if wxUSE_PRINTING_ARCHITECTURE
#if wxUSE_PRINTING_ARCHITECTURE
+#include "wx/dcprint.h"
+
#define INCL_DEV
#define INCL_GPI
#define INCL_PM
#include<os2.h>
#define INCL_DEV
#define INCL_GPI
#define INCL_PM
#include<os2.h>
-#include "wx/dcprint.h"
-
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/math.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/math.h"
@@
-41,8
+41,8
@@
wxPrinterDC::wxPrinterDC( const wxString& rsDriverName,
bool bInteractive,
int nOrientation )
{
bool bInteractive,
int nOrientation )
{
- DEVOPENSTRUC vDevOpen = { (char*)rsDeviceName.
c
_str()
- ,(char*)rsDriverName.
c
_str()
+ DEVOPENSTRUC vDevOpen = { (char*)rsDeviceName.
wx
_str()
+ ,(char*)rsDriverName.
wx
_str()
,NULL
,NULL
,NULL
,NULL
,NULL
,NULL
@@
-223,6
+223,15
@@
void wxPrinterDC::EndPage()
// if (m_hDC)
// ::EndPage((HDC) m_hDC);
} // end of wxPrinterDC::EndPage
// if (m_hDC)
// ::EndPage((HDC) m_hDC);
} // end of wxPrinterDC::EndPage
+
+wxRect wxPrinterDC::GetPaperRect()
+{
+ // Use page rect if we can't get paper rect.
+ wxCoord w, h;
+ GetSize(&w, &h);
+ return wxRect(0, 0, w, h);
+}
+
#if 0
// Returns default device and port names
static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName )
#if 0
// Returns default device and port names
static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName )
@@
-278,7
+287,7
@@
static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName
GlobalFree(pd.hDevMode);
pd.hDevMode=NULL;
}
GlobalFree(pd.hDevMode);
pd.hDevMode=NULL;
}
- return
( deviceName != wxT("")
);
+ return
!deviceName.empty(
);
*/
return true;
} // end of wxGetDefaultDeviceName
*/
return true;
} // end of wxGetDefaultDeviceName