Warning fixes for WinCE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-16 06:34:53 +00:00
parent f428e6c50f
commit 665b71b17c
4 changed files with 27 additions and 21 deletions

View File

@@ -85,10 +85,11 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
UINT flags = 0; UINT flags = 0;
// set appropriate color depth // set appropriate color depth
int dd = wxDisplayDepth();
#ifdef __WXWINCE__ #ifdef __WXWINCE__
flags |= ILC_COLOR; flags |= ILC_COLOR;
#else #else
int dd = wxDisplayDepth();
if (dd <= 4) flags |= ILC_COLOR; // 16 color if (dd <= 4) flags |= ILC_COLOR; // 16 color
else if (dd <= 8) flags |= ILC_COLOR8; // 256 color else if (dd <= 8) flags |= ILC_COLOR8; // 256 color
else if (dd <= 16) flags |= ILC_COLOR16; // 64k hi-color else if (dd <= 16) flags |= ILC_COLOR16; // 64k hi-color

View File

@@ -91,12 +91,12 @@ wxEND_FLAGS( wxListBoxStyle )
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
wxBEGIN_PROPERTIES_TABLE(wxListBox) wxBEGIN_PROPERTIES_TABLE(wxListBox)
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent ) wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent ) wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 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_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 wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE() wxEND_PROPERTIES_TABLE()
@@ -110,9 +110,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
/* /*
TODO PROPERTIES TODO PROPERTIES
selection selection
content content
item item
*/ */
// ============================================================================ // ============================================================================
@@ -537,6 +537,8 @@ wxListBox::DoInsertItems(const wxArrayString& items, int pos)
ListBox_SetItemData(GetHwnd(), idx, pNewItem); ListBox_SetItemData(GetHwnd(), idx, pNewItem);
} }
#else
wxUnusedVar(idx);
#endif // wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN
} }

View File

@@ -93,6 +93,9 @@ static void SetDefaultMenuItem(HMENU hmenu, UINT id)
{ {
wxLogLastError(wxT("SetMenuItemInfo")); wxLogLastError(wxT("SetMenuItemInfo"));
} }
#else
wxUnusedVar(hmenu);
wxUnusedVar(id);
#endif #endif
} }
@@ -135,7 +138,7 @@ template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVa
} }
wxBEGIN_PROPERTIES_TABLE(wxMenu) 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") ) 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 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")) wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

View File

@@ -37,14 +37,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
bool wxWinceHelpController::Initialize(const wxString& filename) bool wxWinceHelpController::Initialize(const wxString& filename)
{ {
m_helpFile = filename; m_helpFile = filename;
return TRUE; return true;
} }
bool wxWinceHelpController::LoadFile(const wxString& file) bool wxWinceHelpController::LoadFile(const wxString& file)
{ {
if (!file.IsEmpty()) if (!file.IsEmpty())
m_helpFile = file; m_helpFile = file;
return TRUE; return true;
} }
bool wxWinceHelpController::DisplayContents() bool wxWinceHelpController::DisplayContents()
@@ -59,30 +59,30 @@ bool wxWinceHelpController::DisplaySection(const wxString& section)
} }
// Use context number // 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, bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k),
wxHelpSearchMode mode) wxHelpSearchMode WXUNUSED(mode))
{ {
return TRUE; return true;
} }
bool wxWinceHelpController::Quit() bool wxWinceHelpController::Quit()