Fixed some warnings (don't know why dialoged Makefile is being committed)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 9896e06500ae43239dd64123c5c4445d397ab9e0..ee19851e3a0c4b5e96f0967a1676fc8a3e06959f 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -2,8 +2,28 @@
 # tardist: make up a tar.gz distribution of wxWindows 2
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
+# We can't use e.g. this:
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# because there's not enough space on the command line, plus we need to ignore the
+# blank lines.
+
+expandlines()
+{
+    toexpand=$1
+    outputfile=$2
+
+    rm -f $outputfile
+    touch $outputfile
+    for line in `cat $toexpand` ; do
+      if [ $line != "" ]; then
+        ls $line >> $outputfile
+      fi
+    done
+}
+
+
 init=""
-WXVER=2.1.16
+WXVER=2.2.0
 if [ $1 = "" ]
 then
   exit

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 62dd5aaadeabc23c24be72a6aac1701234853945..47c083420a98c4f80894f82dbd353fad9ff6a184 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -276,7 +276,7 @@ public:
     inline wxPoint2DDouble GetPosition() 
         { return wxPoint2DDouble(m_x, m_y); }
     inline wxSize GetSize()
-        { return wxSize(m_width, m_height); }
+        { return wxSize((int) m_width, (int) m_height); }
 
     // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
         // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
@@ -593,7 +593,7 @@ inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt)
 
 inline wxPoint2DInt operator*(wxDouble n , const wxPoint2DInt& pt) 
 {
-    return wxPoint2DInt( pt.m_x * n , pt.m_y * n ) ;
+    return wxPoint2DInt( (int) (pt.m_x * n) , (int) (pt.m_y * n) ) ;
 }
 
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n) 
@@ -603,7 +603,7 @@ inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n)
 
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxDouble n) 
 {
-    return wxPoint2DInt( pt.m_x * n , pt.m_y * n ) ;
+    return wxPoint2DInt( (int) (pt.m_x * n) , (int) (pt.m_y * n) ) ;
 }
 
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) 
@@ -618,7 +618,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n)
 
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) 
 {
-    return wxPoint2DInt( pt.m_x / n , pt.m_y / n ) ;
+    return wxPoint2DInt( (int) (pt.m_x / n) , (int) (pt.m_y / n) ) ;
 }
 
 // wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the 

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index adf67bf80fd0c85e80795b4fb370aaceeba86241..a24ea0919f3c50900f33333bc10d8998368cd837 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -151,8 +151,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     wxSize ScreenPixels = wxGetDisplaySize();
     wxSize ScreenMM = wxGetDisplaySizeMM();
 
-    printout->SetPPIScreen( (ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth(),
-                            (ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight() );
+    printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                            (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
     printout->SetPPIPrinter( wxPostScriptDC::GetResolution(),
                              wxPostScriptDC::GetResolution() );
 
@@ -339,8 +339,8 @@ void wxPostScriptPrintPreview::DetermineScaling()
         wxSize ScreenPixels = wxGetDisplaySize();
         wxSize ScreenMM = wxGetDisplaySizeMM();
 
-        m_previewPrintout->SetPPIScreen( (ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth(),
-                                         (ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight() );
+        m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                                         (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
         m_previewPrintout->SetPPIPrinter(wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution()); 
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index b5d5c58a916c5a23dc99e4e7b46c84b404eb16f6..e9c98c66c818ac8964c68f95b354319f84434369 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -2041,7 +2041,7 @@ void wxWindowDC::ComputeScaleAndOrigin()
 // Resolution in pixels per logical inch
 wxSize wxWindowDC::GetPPI() const
 {
-    return wxSize(m_mm_to_pix_x * 25.4 + 0.5, m_mm_to_pix_y * 25.4 + 0.5);
+    return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
 }
 
 int wxWindowDC::GetDepth() const

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 7e5bd7e7db57bc721c0902ebbee9af631b123cb3..4aae2448f713da73d841bff3c8d3d43a1cd1f737 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -155,9 +155,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
                 g_systemBtnShadowColour =
-                   new wxColour(faceColour.Red() * 0.666,
-                                faceColour.Green() * 0.666,
-                                faceColour.Blue() * 0.666);
+                   new wxColour((unsigned char) (faceColour.Red() * 0.666),
+                                (unsigned char) (faceColour.Green() * 0.666),
+                                (unsigned char) (faceColour.Blue() * 0.666));
            }
   /*
             if (!g_systemBtnShadowColour)

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index b5d5c58a916c5a23dc99e4e7b46c84b404eb16f6..e9c98c66c818ac8964c68f95b354319f84434369 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -2041,7 +2041,7 @@ void wxWindowDC::ComputeScaleAndOrigin()
 // Resolution in pixels per logical inch
 wxSize wxWindowDC::GetPPI() const
 {
-    return wxSize(m_mm_to_pix_x * 25.4 + 0.5, m_mm_to_pix_y * 25.4 + 0.5);
+    return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
 }
 
 int wxWindowDC::GetDepth() const

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 7e5bd7e7db57bc721c0902ebbee9af631b123cb3..4aae2448f713da73d841bff3c8d3d43a1cd1f737 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -155,9 +155,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
             {
                 wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
                 g_systemBtnShadowColour =
-                   new wxColour(faceColour.Red() * 0.666,
-                                faceColour.Green() * 0.666,
-                                faceColour.Blue() * 0.666);
+                   new wxColour((unsigned char) (faceColour.Red() * 0.666),
+                                (unsigned char) (faceColour.Green() * 0.666),
+                                (unsigned char) (faceColour.Blue() * 0.666));
            }
   /*
             if (!g_systemBtnShadowColour)

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 4f94570ff07e5bc93e1415e311bfc55c2c0fd05a..3db4b875eb46634ba794278e0740944387749659 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -347,8 +347,8 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
         dc.SetUserScale(us_x * m_Scale, us_y * m_Scale);
     
 //      dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
-        dc.DrawBitmap(*m_Image, (x + m_PosX) / m_Scale, 
-                                (y + m_PosY) / m_Scale, TRUE);
+        dc.DrawBitmap(*m_Image, (int) ((x + m_PosX) / m_Scale), 
+                                (int) ((y + m_PosY) / m_Scale), TRUE);
         dc.SetUserScale(us_x, us_y);
     }
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index b5f8b1ec68e3c94c5617a271e28e1d20a9114717..121b76e3aa2903fdb80b15c3c5fa7375c2d8d608 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -299,7 +299,7 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
         *faceptr = face;
         *encptr = m_OutputEnc;
         *fontptr = new wxFont(
-                       m_FontsSizes[fs] * m_PixelScale,
+                       (int) (m_FontsSizes[fs] * m_PixelScale),
                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,