fix more -Wparentheses warnings after wxLog changes

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

diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index 6de6f2ff5402061495282ae2f9f80b75e5ccaf73..af54170ef00e9b3e8bb8085d287db3f5736b2f47 100644 (file)
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -890,7 +890,9 @@ wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr)
     }
 
     if (bitmap.IsOk())
     }
 
     if (bitmap.IsOk())

+    {

         wxLogDebug(wxT("%i, %i"),bitmap.GetWidth(), bitmap.GetHeight());
         wxLogDebug(wxT("%i, %i"),bitmap.GetWidth(), bitmap.GetHeight());

+    }

 
     ::wxSetCursor( *wxSTANDARD_CURSOR );
 
 
     ::wxSetCursor( *wxSTANDARD_CURSOR );
 

diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp
index 4a83c698300fb65bd69837298c2ae3514a5807ac..773e11803e781381a9d264c517f4e715063275bd 100644 (file)
--- a/samples/widgets/filectrl.cpp
+++ b/samples/widgets/filectrl.cpp
@@ -306,11 +306,17 @@ void FileCtrlWidgetsPage::OnRadioBox( wxCommandEvent& WXUNUSED( event ) )
 void FileCtrlWidgetsPage::OnFileCtrl( wxFileCtrlEvent& event )
 {
     if ( event.GetEventType() == wxEVT_FILECTRL_FOLDERCHANGED )
 void FileCtrlWidgetsPage::OnFileCtrl( wxFileCtrlEvent& event )
 {
     if ( event.GetEventType() == wxEVT_FILECTRL_FOLDERCHANGED )

+    {

         wxLogMessage("Folder changed event, new folder: %s", event.GetDirectory());
         wxLogMessage("Folder changed event, new folder: %s", event.GetDirectory());

+    }

     else if ( event.GetEventType() == wxEVT_FILECTRL_FILEACTIVATED )
     else if ( event.GetEventType() == wxEVT_FILECTRL_FILEACTIVATED )

+    {

         wxLogMessage("File activated event: %s", wxJoin(event.GetFiles(), ' '));
         wxLogMessage("File activated event: %s", wxJoin(event.GetFiles(), ' '));

+    }

     else if ( event.GetEventType() == wxEVT_FILECTRL_SELECTIONCHANGED )
     else if ( event.GetEventType() == wxEVT_FILECTRL_SELECTIONCHANGED )

+    {

         wxLogMessage("Selection changed event: %s", wxJoin(event.GetFiles(), ' '));
         wxLogMessage("Selection changed event: %s", wxJoin(event.GetFiles(), ' '));

+    }

 }
 
 #endif // wxUSE_FILECTRL
 }
 
 #endif // wxUSE_FILECTRL

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index 5a894aad8b037996ebab029e24e5abe40f9162c8..0d41d68b0f09c82ef8604d50cd3912f1b6c21935 100644 (file)
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -448,7 +448,10 @@ ListboxWidgetsPage::GetValidIndexFromText(const wxTextCtrl *text, int *n) const
         // want to retrieve the value as this is only done in answer to a user
         // action
         if ( n )
         // want to retrieve the value as this is only done in answer to a user
         // action
         if ( n )

+        {

             wxLogWarning("Invalid index \"%s\"", text->GetValue());
             wxLogWarning("Invalid index \"%s\"", text->GetValue());

+        }
+

         return false;
     }
 
         return false;
     }