Warning fixes for WinCE.

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index ee8895dbbbc4ad1669dd986377f0453099369db3..af74e0328f5f17e981d5f731e5b138f39f047284 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -85,10 +85,11 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
     UINT flags = 0;
 
     // set appropriate color depth
-    int dd = wxDisplayDepth();
 #ifdef __WXWINCE__
     flags |= ILC_COLOR;
 #else
+    int dd = wxDisplayDepth();
+
     if (dd <= 4)       flags |= ILC_COLOR;     // 16 color
     else if (dd <= 8)  flags |= ILC_COLOR8;    // 256 color
     else if (dd <= 16) flags |= ILC_COLOR16;   // 64k hi-color

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 61634811fa3992b4775d93bdc265b17fcd897157..35d90639e5cafda2d9205126a9f91a1a8a8e59c4 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -91,12 +91,12 @@ wxEND_FLAGS( wxListBoxStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxListBox)
-       wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
-       wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
 
     wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-       wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
     wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
 wxEND_PROPERTIES_TABLE()
 
@@ -110,9 +110,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 /*
 TODO PROPERTIES
-       selection
-       content
-               item
+    selection
+    content
+        item
 */
 
 // ============================================================================
@@ -537,6 +537,8 @@ wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
             ListBox_SetItemData(GetHwnd(), idx, pNewItem);
         }
+#else
+        wxUnusedVar(idx);
 #endif // wxUSE_OWNER_DRAWN
     }
 

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 21fa9db8b639e988f9402811f6a5f441b6288162..1923ba92f28d5e9853e5887acc963eb0a79e38ab 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -93,6 +93,9 @@ static void SetDefaultMenuItem(HMENU hmenu, UINT id)
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
     }
+#else
+    wxUnusedVar(hmenu);
+    wxUnusedVar(id);
 #endif
 }
 
@@ -135,7 +138,7 @@ template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVa
 }
 
 wxBEGIN_PROPERTIES_TABLE(wxMenu)
-       wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
     wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
     wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
     wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 904d4dba72a6d43ccdf93c531c593975f170b449..1e6a0b19a83dd55412676eb1c207cf708ed3744e 100644 (file)
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -37,14 +37,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 bool wxWinceHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::DisplayContents()
@@ -59,30 +59,30 @@ bool wxWinceHelpController::DisplaySection(const wxString& section)
 }
 
 // Use context number
-bool wxWinceHelpController::DisplaySection(int section)
+bool wxWinceHelpController::DisplaySection(int WXUNUSED(section))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayContextPopup(int contextId)
+bool wxWinceHelpController::DisplayContextPopup(int WXUNUSED(contextId))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayTextPopup(const wxString& text, const wxPoint& pos)
+bool wxWinceHelpController::DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayBlock(long block)
+bool wxWinceHelpController::DisplayBlock(long WXUNUSED(block))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::KeywordSearch(const wxString& k,
-                               wxHelpSearchMode mode)
+bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k),
+                               wxHelpSearchMode WXUNUSED(mode))
 {
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::Quit()