WinCE warning fixes.

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 619844b2ec16debff6a2c30c025fe166afdf2b53..b723df633dafb851a242280499857388676eeb11 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -189,6 +189,8 @@ public:
         m_modeOld = ::SetStretchBltMode(m_hdc, mode);
         if ( !m_modeOld )
             wxLogLastError(_T("SetStretchBltMode"));
         m_modeOld = ::SetStretchBltMode(m_hdc, mode);
         if ( !m_modeOld )
             wxLogLastError(_T("SetStretchBltMode"));

+#else
+        wxUnusedVar(mode);

 #endif
     }
 
 #endif
     }
 


@@ -567,6 +569,10 @@ void wxDC::Clear()
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {
 #ifdef __WXWINCE__
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
 {
 #ifdef __WXWINCE__

+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(col);
+    wxUnusedVar(style);

     return false;
 #else
 
     return false;
 #else
 


@@ -778,6 +784,8 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
         }
 #ifndef __WXWINCE__
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         }
 #ifndef __WXWINCE__
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#else
+        wxUnusedVar(fillStyle);

 #endif
         (void)Polygon(GetHdc(), cpoints, n);
 #ifndef __WXWINCE__
 #endif
         (void)Polygon(GetHdc(), cpoints, n);
 #ifndef __WXWINCE__


@@ -1790,6 +1798,9 @@ void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 
         SetMapMode(m_mappingMode);
     }
 
         SetMapMode(m_mappingMode);
     }

+#else
+    wxUnusedVar(xLeftRight);
+    wxUnusedVar(yBottomUp);

 #endif
 }
 
 #endif
 }
 

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 3df7a179793a5ca70bed40a791b80842dfc465da..36c3623a9fe91739ae20657beaecc019ee1e4849 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -665,7 +665,7 @@ HBITMAP wxLoadBMP(const wxString& filename)
           pBmpInfo->bmiHeader.biSizeImage = nBitsSize;
 
           //HBITMAP hBitmap=SetBitmap((LPBITMAPINFO)pBmpInfo, pBits);
           pBmpInfo->bmiHeader.biSizeImage = nBitsSize;
 
           //HBITMAP hBitmap=SetBitmap((LPBITMAPINFO)pBmpInfo, pBits);

-            DWORD dwBitmapInfoSize = sizeof(BITMAPINFO) + nColors*sizeof(RGBQUAD);
+          //DWORD dwBitmapInfoSize = sizeof(BITMAPINFO) + nColors*sizeof(RGBQUAD);

 
             // Create a DC which will be used to get DIB, then create DIBsection
             HDC hDC = ::GetDC(NULL);
 
             // Create a DC which will be used to get DIB, then create DIBsection
             HDC hDC = ::GetDC(NULL);

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 48377785a47076133793e3b75a4004e440dabb16..df1a25d255e9a6a8dc554b5ee58fb5c21578fbaf 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -108,7 +108,7 @@ public:
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     // is), but in some cases, the situation is inversed, that is we delete it
     // when this object is deleted - setting this flag enables such logic
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     // is), but in some cases, the situation is inversed, that is we delete it
     // when this object is deleted - setting this flag enables such logic

-    void SetDeleteFlag() { m_mustDelete = TRUE; }
+    void SetDeleteFlag() { m_mustDelete = true; }

 
     DECLARE_IUNKNOWN_METHODS;
 
 
     DECLARE_IUNKNOWN_METHODS;
 


@@ -267,7 +267,7 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIDataObject)
 wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
 {
     m_pDataObject = pDataObject;
 wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
 {
     m_pDataObject = pDataObject;

-    m_mustDelete = FALSE;
+    m_mustDelete = false;

 }
 
 wxIDataObject::~wxIDataObject()
 }
 
 wxIDataObject::~wxIDataObject()


@@ -779,7 +779,8 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
 
     return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0;
 #else
 
     return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0;
 #else

-    return FALSE;
+    wxUnusedVar(buf);
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -800,9 +801,10 @@ bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 
     SetBitmap(bitmap);
 
 
     SetBitmap(bitmap);
 

-    return TRUE;
+    return true;

 #else
 #else

-    return FALSE;
+    wxUnusedVar(buf);
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -825,7 +827,7 @@ bool wxBitmapDataObject2::GetDataHere(void *pBuf) const
     // we put a bitmap handle into pBuf
     *(WXHBITMAP *)pBuf = GetBitmap().GetHBITMAP();
 
     // we put a bitmap handle into pBuf
     *(WXHBITMAP *)pBuf = GetBitmap().GetHBITMAP();
 

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
 }
 
 bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)


@@ -844,12 +846,12 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
     if ( !bitmap.Ok() ) {
         wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
 
     if ( !bitmap.Ok() ) {
         wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
 

-        return FALSE;
+        return false;

     }
 
     SetBitmap(bitmap);
 
     }
 
     SetBitmap(bitmap);
 

-    return TRUE;
+    return true;

 }
 
 #if 0
 }
 
 #if 0


@@ -914,7 +916,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
         {
             wxLogLastError(wxT("GetDIBits"));
 
         {
             wxLogLastError(wxT("GetDIBits"));
 

-            return FALSE;
+            return false;

         }
     }
     else // CF_BITMAP
         }
     }
     else // CF_BITMAP


@@ -923,7 +925,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
         *(HBITMAP *)pBuf = hbmp;
     }
 
         *(HBITMAP *)pBuf = hbmp;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 }
 
 bool wxBitmapDataObject::SetData(const wxDataFormat& format,


@@ -968,7 +970,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 
     wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
 
 
     wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
 

-    return TRUE;
+    return true;

 }
 
 #endif // 0
 }
 
 #endif // 0


@@ -1011,9 +1013,10 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 #else
 #else

-    return FALSE;
+    wxUnusedVar(pData);
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -1060,7 +1063,7 @@ bool wxFileDataObject::GetDataHere(void *pData) const
 
     // if pData is NULL, or there are no files, return
     if ( !pData || m_filenames.GetCount() == 0 )
 
     // if pData is NULL, or there are no files, return
     if ( !pData || m_filenames.GetCount() == 0 )

-        return FALSE;
+        return false;

 
     // convert data pointer to a DROPFILES struct pointer
     LPDROPFILES pDrop = (LPDROPFILES) pData;
 
     // convert data pointer to a DROPFILES struct pointer
     LPDROPFILES pDrop = (LPDROPFILES) pData;


@@ -1090,9 +1093,10 @@ bool wxFileDataObject::GetDataHere(void *pData) const
     // add final null terminator
     *pbuf = wxT('\0');
 
     // add final null terminator
     *pbuf = wxT('\0');
 

-    return TRUE;
+    return true;

 #else
 #else

-    return FALSE;
+    wxUnusedVar(pData);
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -1135,7 +1139,7 @@ protected:
         memcpy( buffer, unicode_buffer.c_str(),
                 ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
 
         memcpy( buffer, unicode_buffer.c_str(),
                 ( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
 

-        return TRUE;
+        return true;

     }
     virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
                              void *buf) const
     }
     virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
                              void *buf) const

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 0be4463c6eb3fbf8368523fc26e6507e0757765a..67053bdfa00a205f6ba9976775de1d39672849c9 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -123,6 +123,9 @@ wxRegion::wxRegion(const wxRect& rect)
 wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
 wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)

+    wxUnusedVar(n);
+    wxUnusedVar(points);
+    wxUnusedVar(fillStyle);

     m_refData = NULL;
     M_REGION = NULL;
 #else
     m_refData = NULL;
     M_REGION = NULL;
 #else