[1231183] 'cleanup: mismatched indentation' and other cleanings.

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

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index cbf35ed824c2f335dce612cd5b487b589c921dd2..74be937a4e88b2628fd52b97539334df03b6a7c1 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -661,10 +661,12 @@ void GridFrame::DeleteSelectedRows( wxCommandEvent& WXUNUSED(ev) )
     {
         grid->BeginBatch();
         for ( int n = 0; n < grid->GetNumberRows(); )
+        {
             if ( grid->IsInSelection( n , 0 ) )
                 grid->DeleteRows( n, 1 );
-        else
-            n++;
+            else
+                n++;
+        }
         grid->EndBatch();
     }
 }
@@ -676,10 +678,12 @@ void GridFrame::DeleteSelectedCols( wxCommandEvent& WXUNUSED(ev) )
     {
         grid->BeginBatch();
         for ( int n = 0; n < grid->GetNumberCols(); )
+        {
             if ( grid->IsInSelection( 0 , n ) )
                 grid->DeleteCols( n, 1 );
-        else
-            n++;
+            else
+                n++;
+        }
         grid->EndBatch();
     }
 }
@@ -888,7 +892,7 @@ void GridFrame::OnCellValueChanged( wxGridEvent& ev )
 
 void GridFrame::OnCellBeginDrag( wxGridEvent& ev )
 {
-    logBuf = _T("");
+    logBuf = wxEmptyString;
     logBuf  << _T("Got request to drag cell at")
             << _T(" row ") << ev.GetRow()
             << _T(" col ") << ev.GetCol();

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index b920f8e32d677b5d218f1da5002b40fb2da5f954..999ee558cea71f748956918e22431c3a2e989bb0 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -399,7 +399,7 @@ MyFrame::MyFrame(const wxString& title)
     //
     //  Or, you can use the new (2.5.5+) event handler
     //  conversion macros - for instance the above could
-    //  be done as 
+    //  be done as
     //  wxCommandEventHandler(MyFrame::MyHandler)
     //  pretty simple, eh?
     //
@@ -803,9 +803,10 @@ void MyFrame::OnPageChange(wxNotebookEvent& WXUNUSED(event))
 void MyTimer::Notify()
 {
     if (!m_frame->m_notebook->GetCurrentPage()) return;
-        wxMediaCtrl* m_mediactrl = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_mediactrl;
-        wxSlider* m_slider = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_slider;
-        if (!m_mediactrl) return;
+
+    wxMediaCtrl* m_mediactrl = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_mediactrl;
+    wxSlider* m_slider = ((MyNotebookPage*)m_frame->m_notebook->GetCurrentPage())->m_slider;
+    if (!m_mediactrl) return;
 
     long lPosition = (long)( m_mediactrl->Tell() / 1000 );
     m_slider->SetValue(lPosition);

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 72c4b023f123fbddc8d34dde7610d1ba98f8c063..c4efd25cfe838bb9c7c3ec33801a74a5a77a33a7 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -536,7 +536,7 @@ void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
     if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
         wxLogMessage(_T("Combobox enter pressed (now '%s')"), s.c_str());
     else
-    wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
+        wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
 }
 
 void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
@@ -545,7 +545,7 @@ void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
     m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
 
     wxLogMessage(_T("Combobox item %ld selected"), sel);
-    
+
     wxLogMessage(_T("Combobox GetValue(): %s"), m_combobox->GetValue().c_str() );
 }