From dff63abaf14073d37606f6f6d35bc173ce0ff78e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 28 Sep 2009 16:02:08 +0000 Subject: [PATCH] Moved WinPrinter from private.h to printdlg.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/private.h | 46 ---------------------------------------- src/msw/printdlg.cpp | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 233986fffa..a96d9d2183 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -650,52 +650,6 @@ private: DECLARE_NO_COPY_CLASS(GlobalPtrLock) }; -// smart pointer like class using OpenPrinter and ClosePrinter -class WinPrinter -{ -public: - // default ctor - WinPrinter() - { - m_hPrinter = (HANDLE)NULL; - } - - WinPrinter( const wxString& printerName ) - { - Open( printerName ); - } - - ~WinPrinter() - { - Close(); - } - - BOOL Open( const wxString& printerName, LPPRINTER_DEFAULTS pDefault=(LPPRINTER_DEFAULTS)NULL ) - { - Close(); - return OpenPrinter( (LPTSTR)printerName.wx_str(), &m_hPrinter, pDefault ); - } - - BOOL Close() - { - BOOL result = TRUE; - if( m_hPrinter ) - { - result = ClosePrinter( m_hPrinter ); - m_hPrinter = (HANDLE)NULL; - } - return result; - } - - operator HANDLE() { return m_hPrinter; } - operator bool() { return m_hPrinter != (HANDLE)NULL; } - -private: - HANDLE m_hPrinter; - - DECLARE_NO_COPY_CLASS(WinPrinter); -}; - // register the class when it is first needed and unregister it in dtor class ClassRegistrar { diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index f05f53bf48..6f46431931 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -46,6 +46,52 @@ #include #endif +// smart pointer like class using OpenPrinter and ClosePrinter +class WinPrinter +{ +public: + // default ctor + WinPrinter() + { + m_hPrinter = (HANDLE)NULL; + } + + WinPrinter( const wxString& printerName ) + { + Open( printerName ); + } + + ~WinPrinter() + { + Close(); + } + + BOOL Open( const wxString& printerName, LPPRINTER_DEFAULTS pDefault=(LPPRINTER_DEFAULTS)NULL ) + { + Close(); + return OpenPrinter( (LPTSTR)printerName.wx_str(), &m_hPrinter, pDefault ); + } + + BOOL Close() + { + BOOL result = TRUE; + if( m_hPrinter ) + { + result = ClosePrinter( m_hPrinter ); + m_hPrinter = (HANDLE)NULL; + } + return result; + } + + operator HANDLE() { return m_hPrinter; } + operator bool() { return m_hPrinter != (HANDLE)NULL; } + +private: + HANDLE m_hPrinter; + + DECLARE_NO_COPY_CLASS(WinPrinter); +}; + //---------------------------------------------------------------------------- // wxWindowsPrintNativeData //----------------------------------------------------------------------------