Renamed duplicate style variable

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 6a94ee3f8679de97ead0040a1096762d5cbc31d0..3890805a6d829be72e78b26923ffcb7dfef5fd7a 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1126,13 +1126,13 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 

-    long style = ms_lastViewStyle | wxSUNKEN_BORDER;
+    long style2 = ms_lastViewStyle | wxSUNKEN_BORDER;

     if ( !(m_dialogStyle & wxMULTIPLE) )
     if ( !(m_dialogStyle & wxMULTIPLE) )

-        style |= wxLC_SINGLE_SEL;
+        style2 |= wxLC_SINGLE_SEL;

 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL, firstWild, ms_lastShowHidden,
                              wxDefaultPosition, wxSize(540,200),
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL, firstWild, ms_lastShowHidden,
                              wxDefaultPosition, wxSize(540,200),

-                             style);
+                             style2);

 
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);
 
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);