libjpeg not used by default (it didn't even link)

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 1df225556d04164231e8c463b14e2b848266d5da..73f33909521e59a5f224378bc019e6c523a04fd0 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -255,7 +255,7 @@ void wxDC::SetPalette(const wxPalette& palette)
     m_oldPalette = 0;
   }
 
     m_oldPalette = 0;
   }
 

-  m_palette = m_palette;
+  m_palette = palette;

 
   if (!m_palette.Ok())
   {
 
   if (!m_palette.Ok())
   {


@@ -380,7 +380,7 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
   double radius = (double)sqrt(dx*dx+dy*dy) ;;
   if (x1==x2 && x2==y2)
   {
   double radius = (double)sqrt(dx*dx+dy*dy) ;;
   if (x1==x2 && x2==y2)
   {

-    DrawEllipse(xc,yc,(double)(radius*2.0),(double)(radius*2)) ;
+    DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0)) ;

     return ;
   }
 
     return ;
   }
 


@@ -605,7 +605,7 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
 
 void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
 {
 
 void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
 {

-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)

   ::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
       icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
 #else
   ::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
       icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
 #else


@@ -677,7 +677,7 @@ void wxDC::SetFont(const wxFont& the_font)
   if (m_font.Ok() && m_font.GetResourceHandle())
   {
     HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
   if (m_font.Ok() && m_font.GetResourceHandle())
   {
     HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());

-    if (f == NULL)
+    if (f == (HFONT) NULL)

     {
         wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
     }
     {
         wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
     }


@@ -894,10 +894,14 @@ bool wxDC::StartDoc(const wxString& message)
 #else
 #ifdef UNICODE
      ::StartDocW((HDC) m_hDC, &docinfo);
 #else
 #ifdef UNICODE
      ::StartDocW((HDC) m_hDC, &docinfo);

+#else
+#ifdef __TWIN32__
+     ::StartDoc((HDC) m_hDC, &docinfo);

 #else
      ::StartDocA((HDC) m_hDC, &docinfo);
 #endif
 #endif
 #else
      ::StartDocA((HDC) m_hDC, &docinfo);
 #endif
 #endif

+#endif

 
 #ifndef __WIN16__
   if (ret <= 0)
 
 #ifndef __WIN16__
   if (ret <= 0)


@@ -1680,7 +1684,7 @@ static bool wx_spline_add_point(double x, double y)
 
 static void wx_spline_draw_point_array(wxDC *dc)
 {
 
 static void wx_spline_draw_point_array(wxDC *dc)
 {

-  dc->DrawLines(&wx_spline_point_list, (double)0.0, (double)0.0);
+  dc->DrawLines(&wx_spline_point_list, 0, 0);

   wxNode *node = wx_spline_point_list.First();
   while (node)
   {
   wxNode *node = wx_spline_point_list.First();
   while (node)
   {