Rebake from clean wx tree.

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index fa95062dc0dee2e70e764d79966707aa6da9746a..2d75ccdf6a12ae88035862a9bde506414f1eccb3 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -727,52 +727,6 @@ private:
     wxDECLARE_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;
-
-    wxDECLARE_NO_COPY_CLASS(WinPrinter);
-};
-
 // register the class when it is first needed and unregister it in dtor
 class ClassRegistrar
 {
@@ -922,9 +876,10 @@ inline wxString wxGetFullModuleName()
 //      0x0400      Windows 95, NT4
 //      0x0410      Windows 98
 //      0x0500      Windows ME, 2000
-//      0x0501      Windows XP
-//      0x0502      Windows 2003
-//      0x0600      Longhorn
+//      0x0501      Windows XP, 2003
+//      0x0502      Windows XP SP2, 2003 SP1
+//      0x0600      Windows Vista, 2008
+//      0x0601      Windows 7
 //
 // for the other Windows versions 0 is currently returned
 enum wxWinVersion
@@ -944,11 +899,15 @@ enum wxWinVersion
     wxWinVersion_NT5 = wxWinVersion_5,
     wxWinVersion_2000 = wxWinVersion_5,
     wxWinVersion_XP = 0x0501,
-    wxWinVersion_2003 = 0x0502,
+    wxWinVersion_2003 = 0x0501,
+    wxWinVersion_XP_SP2 = 0x0502,
+    wxWinVersion_2003_SP1 = 0x0502,
 
     wxWinVersion_6 = 0x0600,
     wxWinVersion_Vista = wxWinVersion_6,
-    wxWinVersion_NT6 = wxWinVersion_6
+    wxWinVersion_NT6 = wxWinVersion_6,
+
+    wxWinVersion_7 = 0x601
 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();