From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 6 Dec 2004 17:35:00 +0000 (+0000)
Subject: Warning fixes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/abc2a4ccec3d06d4b268d5ac3c97d657721f5cff

Warning fixes.


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

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index a2af01db75..85650fe182 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -278,13 +278,13 @@ void MyFrame::OnPrintAbout(wxCommandEvent& WXUNUSED(event))
         _T("About wxWidgets printing demo"), wxOK|wxCENTRE);
 }
 
-void MyFrame::OnAngleUp(wxCommandEvent& event)
+void MyFrame::OnAngleUp(wxCommandEvent& WXUNUSED(event))
 {
     m_angle += 5;
     canvas->Refresh();
 }
 
-void MyFrame::OnAngleDown(wxCommandEvent& event)
+void MyFrame::OnAngleDown(wxCommandEvent& WXUNUSED(event))
 {
     m_angle -= 5;
     canvas->Refresh();
@@ -310,7 +310,7 @@ void MyFrame::Draw(wxDC& dc)
     dc.SetPen(*wxRED_PEN);
 
     dc.DrawText( wxT("Test message: this is in 10 point text"), 10, 180);
-    
+
 #if wxUSE_UNICODE
     char *test = "Hebrew    שלום -- Japanese (日本語)";
     wxString tmp = wxConvUTF8.cMB2WC( test );
@@ -333,7 +333,7 @@ void MyFrame::Draw(wxDC& dc)
     wxIcon my_icon = wxICON(mondrian) ;
 
     dc.DrawIcon( my_icon, 100, 100);
-    
+
     if (m_bitmap.Ok())
         dc.DrawBitmap( m_bitmap, 10, 10 );
 }
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 2b482b1356..24d1b96afb 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -140,7 +140,7 @@ int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
-#define IsTopMostDir(dir)   (dir.IsEmpty())
+#define IsTopMostDir(dir)   (dir.empty())
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
@@ -507,20 +507,20 @@ void wxFileCtrl::UpdateFiles()
 
 #if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
     if ( IsTopMostDir(m_dirName) )
-        {
+    {
         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)
-            {
+        {
             wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
             if (Add(fd, item) != -1)
                 item.m_itemId++;
             else
                 delete fd;
-            }
         }
+    }
     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {
@@ -529,7 +529,7 @@ void wxFileCtrl::UpdateFiles()
         {
             wxString p(wxPathOnly(m_dirName));
 #if defined(__UNIX__) && !defined(__OS2__)
-            if (p.IsEmpty()) p = wxT("/");
+            if (p.empty()) p = wxT("/");
 #endif // __UNIX__
             wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
             if (Add(fd, item) != -1)
@@ -660,18 +660,18 @@ void wxFileCtrl::GoToParentDir()
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-        if (!m_dirName.IsEmpty())
+        if (!m_dirName.empty())
         {
             if (m_dirName.Last() == wxT('.'))
                 m_dirName = wxEmptyString;
         }
 #elif defined(__UNIX__)
-        if (m_dirName.IsEmpty())
+        if (m_dirName.empty())
             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );
-        if (id != -1)
+        if (id != wxNOT_FOUND)
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
@@ -735,7 +735,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 
-    if ((event.GetLabel().IsEmpty()) ||
+    if ((event.GetLabel().empty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
@@ -881,18 +881,18 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                     :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 {
     m_bypassGenericImpl = bypassGenericImpl;
-    
+
     if (!m_bypassGenericImpl)
         Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
 }
 
 bool wxGenericFileDialog::Create( wxWindow *parent,
-                           const wxString& message,
-                           const wxString& defaultDir,
-                           const wxString& defaultFile,
-                           const wxString& wildCard,
-                           long style,
-                           const wxPoint& pos )
+                                  const wxString& message,
+                                  const wxString& WXUNUSED(defaultDir),
+                                  const wxString& defaultFile,
+                                  const wxString& wildCard,
+                                  long WXUNUSED(style),
+                                  const wxPoint& pos )
 {
     if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
@@ -1049,7 +1049,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
     Centre( wxBOTH );
 
     m_text->SetFocus();
-    
+
     return true;
 }
 
@@ -1200,7 +1200,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();
-    if (filename.IsEmpty()) return;
+    if (filename.empty()) return;
     if (filename == wxT(".")) return;
 
     // "some/place/" means they want to chdir not try to load "place"