X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461dae941dac51a523a4280d3e1800143b720305..02a8e64ca3a617d776e6e5f881f915aadbd47c4c:/src/generic/logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 5871419db7..6dafd5d079 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -171,7 +171,7 @@ END_EVENT_TABLE()
 // filename and try to open it, returns TRUE on success (file was opened),
 // FALSE if file couldn't be opened/created and -1 if the file selection
 // dialog was cancelled
-static int OpenLogFile(wxFile& file, wxString *filename = NULL);
+static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 
 #endif // wxUSE_FILE
 
@@ -542,7 +542,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_FILEDLG
     wxString filename;
     wxFile file;
-    int rc = OpenLogFile(file, &filename);
+    int rc = OpenLogFile(file, &filename, this);
     if ( rc == -1 )
     {
         // cancelled
@@ -754,7 +754,6 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
 
-#ifndef __WIN16__
     wxBitmap bitmap;
     switch ( style & wxICON_MASK )
     {
@@ -783,7 +782,6 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
             wxFAIL_MSG(_T("incorrect log style"));
     }
     sizerAll->Add(new wxStaticBitmap(this, -1, bitmap), 0);
-#endif // !Win16
 
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 1,
@@ -862,7 +860,6 @@ void wxLogDialog::CreateDetailsControls()
 
     bool loadedIcons = TRUE;
 
-#ifndef __WIN16__
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {
         wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
@@ -881,7 +878,6 @@ void wxLogDialog::CreateDetailsControls()
     }
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
-#endif // !Win16
 
     // and fill it
     wxString fmt = wxLog::GetTimestamp();
@@ -896,7 +892,6 @@ void wxLogDialog::CreateDetailsControls()
     {
         int image;
 
-#ifndef __WIN16__
         if ( loadedIcons )
         {
             switch ( m_severity[n] )
@@ -914,7 +909,6 @@ void wxLogDialog::CreateDetailsControls()
             }
         }
         else // failed to load images
-#endif // !Win16
         {
             image = -1;
         }
@@ -963,7 +957,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FILEDLG
     wxFile file;
-    int rc = OpenLogFile(file);
+    int rc = OpenLogFile(file, NULL, this);
     if ( rc == -1 )
     {
         // cancelled
@@ -1103,11 +1097,11 @@ wxLogDialog::~wxLogDialog()
 // filename and try to open it, returns TRUE on success (file was opened),
 // FALSE if file couldn't be opened/created and -1 if the file selection
 // dialog was cancelled
-static int OpenLogFile(wxFile& file, wxString *pFilename)
+static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 {
     // get the file name
     // -----------------
-    wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));
+    wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"), parent);
     if ( !filename ) {
         // cancelled
         return -1;