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 f33d38372f400118279b2505ab32bb4f15460aad..2d75ccdf6a12ae88035862a9bde506414f1eccb3 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -368,7 +368,9 @@ inline RECT wxGetWindowRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetWindowRect(hwnd, &rect) )
     RECT rect;
 
     if ( !::GetWindowRect(hwnd, &rect) )

-        wxLogLastError(_T("GetWindowRect"));
+    {
+        wxLogLastError(wxT("GetWindowRect"));
+    }

 
     return rect;
 }
 
     return rect;
 }


@@ -378,7 +380,9 @@ inline RECT wxGetClientRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetClientRect(hwnd, &rect) )
     RECT rect;
 
     if ( !::GetClientRect(hwnd, &rect) )

-        wxLogLastError(_T("GetClientRect"));
+    {
+        wxLogLastError(wxT("GetClientRect"));
+    }

 
     return rect;
 }
 
     return rect;
 }


@@ -448,7 +452,7 @@ public:
 
     void Init(HDC hdc, HGDIOBJ hgdiobj)
     {
 
     void Init(HDC hdc, HGDIOBJ hgdiobj)
     {

-        wxASSERT_MSG( !m_hdc, _T("initializing twice?") );
+        wxASSERT_MSG( !m_hdc, wxT("initializing twice?") );

 
         m_hdc = hdc;
 
 
         m_hdc = hdc;
 


@@ -477,7 +481,7 @@ protected:
 
     void InitGdiobj(HGDIOBJ gdiobj)
     {
 
     void InitGdiobj(HGDIOBJ gdiobj)
     {

-        wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
+        wxASSERT_MSG( !m_gdiobj, wxT("initializing twice?") );

 
         m_gdiobj = gdiobj;
     }
 
         m_gdiobj = gdiobj;
     }


@@ -570,7 +574,9 @@ public:
         : m_hdc(hdc)
     {
         if ( !::SelectClipRgn(hdc, hrgn) )
         : m_hdc(hdc)
     {
         if ( !::SelectClipRgn(hdc, hrgn) )

-            wxLogLastError(_T("SelectClipRgn"));
+        {
+            wxLogLastError(wxT("SelectClipRgn"));
+        }

     }
 
     ~HDCClipper()
     }
 
     ~HDCClipper()


@@ -599,7 +605,9 @@ private:
         {
             m_modeOld = ::SetMapMode(hdc, mm);
             if ( !m_modeOld )
         {
             m_modeOld = ::SetMapMode(hdc, mm);
             if ( !m_modeOld )

-                wxLogLastError(_T("SelectClipRgn"));
+            {
+                wxLogLastError(wxT("SelectClipRgn"));
+            }

         }
 
         ~HDCMapModeChanger()
         }
 
         ~HDCMapModeChanger()


@@ -634,7 +642,9 @@ public:
     {
         m_hGlobal = ::GlobalAlloc(flags, size);
         if ( !m_hGlobal )
     {
         m_hGlobal = ::GlobalAlloc(flags, size);
         if ( !m_hGlobal )

-            wxLogLastError(_T("GlobalAlloc"));
+        {
+            wxLogLastError(wxT("GlobalAlloc"));
+        }

     }
 
     GlobalPtr(size_t size, unsigned flags = GMEM_MOVEABLE)
     }
 
     GlobalPtr(size_t size, unsigned flags = GMEM_MOVEABLE)


@@ -645,7 +655,9 @@ public:
     ~GlobalPtr()
     {
         if ( m_hGlobal && ::GlobalFree(m_hGlobal) )
     ~GlobalPtr()
     {
         if ( m_hGlobal && ::GlobalFree(m_hGlobal) )

-            wxLogLastError(_T("GlobalFree"));
+        {
+            wxLogLastError(wxT("GlobalFree"));
+        }

     }
 
     // implicit conversion
     }
 
     // implicit conversion


@@ -681,7 +693,9 @@ public:
         //     global scope operator with it (and neither with GlobalUnlock())
         m_ptr = GlobalLock(hGlobal);
         if ( !m_ptr )
         //     global scope operator with it (and neither with GlobalUnlock())
         m_ptr = GlobalLock(hGlobal);
         if ( !m_ptr )

-            wxLogLastError(_T("GlobalLock"));
+        {
+            wxLogLastError(wxT("GlobalLock"));
+        }

     }
 
     // initialize the object, HGLOBAL must not be NULL
     }
 
     // initialize the object, HGLOBAL must not be NULL


@@ -698,7 +712,7 @@ public:
             DWORD dwLastError = ::GetLastError();
             if ( dwLastError != NO_ERROR )
             {
             DWORD dwLastError = ::GetLastError();
             if ( dwLastError != NO_ERROR )
             {

-                wxLogApiError(_T("GlobalUnlock"), dwLastError);
+                wxLogApiError(wxT("GlobalUnlock"), dwLastError);

             }
         }
     }
             }
         }
     }


@@ -731,12 +745,12 @@ public:
     {
         // we should only be called if we hadn't been initialized yet
         wxASSERT_MSG( m_registered == -1,
     {
         // we should only be called if we hadn't been initialized yet
         wxASSERT_MSG( m_registered == -1,

-                        _T("calling ClassRegistrar::Register() twice?") );
+                        wxT("calling ClassRegistrar::Register() twice?") );

 
         m_registered = ::RegisterClass(&wc) ? 1 : 0;
         if ( !IsRegistered() )
         {
 
         m_registered = ::RegisterClass(&wc) ? 1 : 0;
         if ( !IsRegistered() )
         {

-            wxLogLastError(_T("RegisterClassEx()"));
+            wxLogLastError(wxT("RegisterClassEx()"));

         }
         else
         {
         }
         else
         {


@@ -757,7 +771,7 @@ public:
         {
             if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )
             {
         {
             if ( !::UnregisterClass(m_clsname.wx_str(), wxhInstance) )
             {

-                wxLogLastError(_T("UnregisterClass"));
+                wxLogLastError(wxT("UnregisterClass"));

             }
         }
     }
             }
         }
     }


@@ -843,7 +857,7 @@ inline wxString wxGetFullModuleName(HMODULE hmod)
                 MAX_PATH
             ) )
     {
                 MAX_PATH
             ) )
     {

-        wxLogLastError(_T("GetModuleFileName"));
+        wxLogLastError(wxT("GetModuleFileName"));

     }
 
     return fullname;
     }
 
     return fullname;


@@ -862,9 +876,10 @@ inline wxString wxGetFullModuleName()
 //      0x0400      Windows 95, NT4
 //      0x0410      Windows 98
 //      0x0500      Windows ME, 2000
 //      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
 //
 // for the other Windows versions 0 is currently returned
 enum wxWinVersion


@@ -884,11 +899,15 @@ enum wxWinVersion
     wxWinVersion_NT5 = wxWinVersion_5,
     wxWinVersion_2000 = wxWinVersion_5,
     wxWinVersion_XP = 0x0501,
     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_6 = 0x0600,
     wxWinVersion_Vista = wxWinVersion_6,

-    wxWinVersion_NT6 = wxWinVersion_6
+    wxWinVersion_NT6 = wxWinVersion_6,
+
+    wxWinVersion_7 = 0x601

 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();