VC++ warning fixes

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

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 6a7475fadb971d0cddd563c5b45ba24210df067e..6d4ea446425ac5bb408393fc5c080c4c258c4602 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -159,7 +159,7 @@ bool wxCommandProcessor::Undo()
 bool wxCommandProcessor::Redo()
 {
     wxCommand *redoCommand = (wxCommand *) NULL;
 bool wxCommandProcessor::Redo()
 {
     wxCommand *redoCommand = (wxCommand *) NULL;

-    wxList::compatibility_iterator redoNode;
+    wxList::compatibility_iterator redoNode = 0;

 
     if ( m_currentCommand )
     {
 
     if ( m_currentCommand )
     {

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 8534732e7ba1577775e4a9e70b8b59365cea589c..beeb4bd6a6e7611d27dcf0257b0dc1c72933eb4f 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -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();
         x1 = x2;
     {
         p = (wxPoint *)node->GetData();
         x1 = x2;

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index be7d11a616aa894405e2347c14a70ba802cd0830..8c9eca91d3603888d2462e826c3838ffb1990349 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -374,8 +374,8 @@ void wxHtmlParser::PopTagHandler()
 {
     wxList::compatibility_iterator first;
 
 {
     wxList::compatibility_iterator first;
 

-    if (m_HandlersStack == NULL ||
-        !(first = m_HandlersStack->GetFirst()))
+    if ( !m_HandlersStack ||
+         (first = m_HandlersStack->GetFirst()) == NULL )

     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;
     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 698b38d7cb0cbf949bfd3c2dddd3e9a9fe98b9ed..8c5390cc5ce90cc695ba1a4ece89686352ebb382 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -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