VC++ warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -159,7 +159,7 @@ bool wxCommandProcessor::Undo()
|
|||||||
bool wxCommandProcessor::Redo()
|
bool wxCommandProcessor::Redo()
|
||||||
{
|
{
|
||||||
wxCommand *redoCommand = (wxCommand *) NULL;
|
wxCommand *redoCommand = (wxCommand *) NULL;
|
||||||
wxList::compatibility_iterator redoNode;
|
wxList::compatibility_iterator redoNode = 0;
|
||||||
|
|
||||||
if ( m_currentCommand )
|
if ( m_currentCommand )
|
||||||
{
|
{
|
||||||
|
@@ -290,7 +290,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
|
|||||||
|
|
||||||
wx_spline_add_point(x1, y1);
|
wx_spline_add_point(x1, y1);
|
||||||
|
|
||||||
while ((node = node->GetNext()))
|
while ((node = node->GetNext()) != NULL)
|
||||||
{
|
{
|
||||||
p = (wxPoint *)node->GetData();
|
p = (wxPoint *)node->GetData();
|
||||||
x1 = x2;
|
x1 = x2;
|
||||||
|
@@ -374,8 +374,8 @@ void wxHtmlParser::PopTagHandler()
|
|||||||
{
|
{
|
||||||
wxList::compatibility_iterator first;
|
wxList::compatibility_iterator first;
|
||||||
|
|
||||||
if (m_HandlersStack == NULL ||
|
if ( !m_HandlersStack ||
|
||||||
!(first = m_HandlersStack->GetFirst()))
|
(first = m_HandlersStack->GetFirst()) == NULL )
|
||||||
{
|
{
|
||||||
wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
|
wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
|
||||||
return;
|
return;
|
||||||
|
@@ -191,7 +191,7 @@ bool wxDialog::IsModal() const
|
|||||||
|
|
||||||
bool wxDialog::IsModalShowing() const
|
bool wxDialog::IsModalShowing() const
|
||||||
{
|
{
|
||||||
return wxModalDialogs.Find((wxDialog *)this); // const_cast
|
return wxModalDialogs.Find(wxConstCast(this, wxDialog)) != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxWindow *wxDialog::FindSuitableParent() const
|
wxWindow *wxDialog::FindSuitableParent() const
|
||||||
|
Reference in New Issue
Block a user