compilation fix for broken OS/2 compiler

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 99a4b4e7e62d81f8e054d7cec78658c0907684af..c5e260c9b20eb54b23496a009391e63c88207a03 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -57,15 +57,11 @@
   #include  "wx/msw/private.h"
 #endif // Windows
 
   #include  "wx/msw/private.h"
 #endif // Windows
 

-// may be defined to 0 for old behavior (using wxMessageBox) - shouldn't be
-// changed normally (that's why it's here and not in setup.h)
-#define wxUSE_LOG_DIALOG 1
-

 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"

-#else // !wxUSE_TEXTFILE
+#else // !wxUSE_LOG_DIALOG

     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
     #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 


@@ -152,7 +148,7 @@ END_EVENT_TABLE()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-#if wxUSE_FILE
+#if wxUSE_FILE && wxUSE_FILEDLG

 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),


@@ -167,7 +163,7 @@ static int OpenLogFile(wxFile& file, wxString *filename = NULL);
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,

-// but it's he easiest way
+// but it's the easiest way

 static wxFrame *gs_pFrame; // FIXME MT-unsafe
 
 // ============================================================================
 static wxFrame *gs_pFrame; // FIXME MT-unsafe
 
 // ============================================================================


@@ -261,6 +257,7 @@ void wxLogGui::Flush()
     else // more than one message
     {
 #if wxUSE_LOG_DIALOG
     else // more than one message
     {
 #if wxUSE_LOG_DIALOG

+

         wxLogDialog dlg(parent,
                         m_aMessages, m_aSeverity, m_aTimes,
                         title, style);
         wxLogDialog dlg(parent,
                         m_aMessages, m_aSeverity, m_aTimes,
                         title, style);


@@ -339,7 +336,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {

-                #ifdef __WXMSW__
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

                     // don't prepend debug/trace here: it goes to the
                     // debug window anyhow, but do put a timestamp
                     wxString str;
                     // don't prepend debug/trace here: it goes to the
                     // debug window anyhow, but do put a timestamp
                     wxString str;


@@ -459,6 +456,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
             wxHSCROLL       |
             wxTE_READONLY);
 
             wxHSCROLL       |
             wxTE_READONLY);
 

+#if wxUSE_MENUS

     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;


@@ -470,6 +468,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts
 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts


@@ -502,6 +501,7 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 #if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename);
     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename);


@@ -530,6 +530,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
     else {
         wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }
     else {
         wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }

+#endif

 }
 #endif // wxUSE_FILE
 
 }
 #endif // wxUSE_FILE
 


@@ -889,6 +890,7 @@ void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 
 void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     wxFile file;
     int rc = OpenLogFile(file);
     if ( rc == -1 )
     wxFile file;
     int rc = OpenLogFile(file);
     if ( rc == -1 )


@@ -923,6 +925,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 
     if ( !ok )
         wxLogError(_("Can't save log contents to file."));
 
     if ( !ok )
         wxLogError(_("Can't save log contents to file."));

+#endif

 }
 
 #endif // wxUSE_FILE
 }
 
 #endif // wxUSE_FILE


@@ -989,7 +992,7 @@ wxLogDialog::~wxLogDialog()
 
 #endif // wxUSE_LOG_DIALOG
 
 
 #endif // wxUSE_LOG_DIALOG
 

-#if wxUSE_FILE
+#if wxUSE_FILE && wxUSE_FILEDLG

 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns TRUE on success (file was opened),