include/wx/choice.hpragma warning is only for VC++

[wxWidgets.git] / src / msw / dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index d17e9b196137b35cc9628f1b159de6226d551c97..c32a359fd15aa6d5d4867fe410399e41f0898d6f 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -46,6 +46,9 @@
 #include <math.h>
 
 #if wxUSE_COMMON_DIALOGS
+#if wxUSE_NORLANDER_HEADERS
+    #include <windows.h>
+#endif
     #include <commdlg.h>
 #endif
 
@@ -174,7 +177,7 @@ void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch)
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
-    wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") );
+    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
 
     wxRect box = region.GetBox();
 
@@ -249,7 +252,7 @@ void wxDC::Clear()
     }
     else
     {
-        wxCHECK_RET( m_selectedBitmap.Ok(), _T("this DC can't be cleared") );
+        wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
 
         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
@@ -374,8 +377,8 @@ void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
         Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
         xx1,yy1,xx2,yy2);
 
-    CalcBoundingBox((xc-radius), (yc-radius));
-    CalcBoundingBox((xc+radius), (yc+radius));
+    CalcBoundingBox((long)(xc-radius), (long)(yc-radius));
+    CalcBoundingBox((long)(xc+radius), (long)(yc+radius));
 }
 
 void wxDC::DoDrawPoint(long x, long y)
@@ -592,7 +595,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
         HDC memdc = ::CreateCompatibleDC( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
 
-        wxASSERT_MSG( hbitmap, _T("bitmap is ok but HBITMAP is NULL?") );
+        wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
 
         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
@@ -715,7 +718,7 @@ void wxDC::SetFont(const wxFont& the_font)
         HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
         if (f == (HFONT) NULL)
         {
-            wxLogDebug(_T("::SelectObject failed in wxDC::SetFont."));
+            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
         }
         if (!m_oldFont)
             m_oldFont = (WXHFONT) f;