--- /dev/null
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/msgout.h
+// Purpose: wxMessageOutput class. Shows a message to the user
+// Author: Mattia Barbon
+// Modified by:
+// Created: 17.07.02
+// RCS-ID: $Id$
+// Copyright: (c) wxWindows team
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSGOUT_H_
+#define _WX_MSGOUT_H_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+ #pragma interface "msgout.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/wxchar.h"
+
+class WXDLLEXPORT wxMessageOutput
+{
+public:
+ virtual ~wxMessageOutput() {};
+
+ // show a message to the user
+ virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2 = 0;
+ // gets the current wxMessageOutput object
+ static wxMessageOutput* Get();
+ // sets the global wxMessageOutput instance; returns the previous one
+ static wxMessageOutput* Set(wxMessageOutput* msgout);
+private:
+ static wxMessageOutput* ms_msgOut;
+};
+
+// sends output to stderr
+class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
+{
+public:
+ wxMessageOutputStderr() {};
+
+ virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
+
+#if wxUSE_GUI
+
+// shows output in a message box
+class WXDLLEXPORT wxMessageOutputMessageBox : public wxMessageOutput
+{
+public:
+ wxMessageOutputMessageBox() {};
+
+ virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
+
+#ifdef __WXMOTIF__
+
+// use wxLog; this is only required for wxMotif, so we put this code
+// inside wxUSE_GUI; it will work even without GUI
+class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+{
+public:
+ wxMessageOutputLog() {};
+
+ virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
+
+#endif // __WXMOTIF__
+
+#endif // wxUSE_GUI
+
+#endif
+ // _WX_MSGOUT_H_
#include <ctype.h>
#include "wx/datetime.h"
+#include "wx/msgout.h"
// ----------------------------------------------------------------------------
// private functions
size_t currentParam = 0; // the index in m_paramDesc
size_t countParam = m_data->m_paramDesc.GetCount();
+ wxString errorMsg;
Reset();
optInd = m_data->FindOptionByLongName(name);
if ( optInd == wxNOT_FOUND )
{
- wxLogError(_("Unknown long option '%s'"), name.c_str());
+ errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) << "\n";
}
}
else
// Print the argument including leading "--"
name.Prepend( wxT("--") );
- wxLogError(_("Unknown option '%s'"), name.c_str());
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << "\n";
}
}
{
// we couldn't find a valid option name in the
// beginning of this string
- wxLogError(_("Unknown option '%s'"), name.c_str());
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << "\n";
break;
}
if ( *p++ != _T('=') )
{
- wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str());
+ errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str()) << "\n";
ok = FALSE;
}
if ( ++n == count )
{
// ... but there is none
- wxLogError(_("Option '%s' requires a value."),
- name.c_str());
+ errorMsg << wxString::Format(_("Option '%s' requires a value."),
+ name.c_str()) << "\n";
ok = FALSE;
}
// not depending on the option style
if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
{
- wxLogError(_("Separator expected after the option '%s'."),
- name.c_str());
+ errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
+ name.c_str()) << "\n";
ok = FALSE;
}
}
else
{
- wxLogError(_("'%s' is not a correct numeric value for option '%s'."),
- value.c_str(), name.c_str());
+ errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
+ value.c_str(), name.c_str()) << "\n";
ok = FALSE;
}
const wxChar *res = dt.ParseDate(value);
if ( !res || *res )
{
- wxLogError(_("Option '%s': '%s' cannot be converted to a date."),
- name.c_str(), value.c_str());
+ errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
+ name.c_str(), value.c_str()) << "\n";
ok = FALSE;
}
}
else
{
- wxLogError(_("Unexpected parameter '%s'"), arg.c_str());
+ errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str()) << "\n";
ok = FALSE;
}
opt.longName.c_str());
}
- wxLogError(_("The value for the option '%s' must be specified."),
- optName.c_str());
+ errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
+ optName.c_str()) << "\n";
ok = FALSE;
}
if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
- wxLogError(_("The required parameter '%s' was not specified."),
- param.description.c_str());
+ errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
+ param.description.c_str()) << "\n";
ok = FALSE;
}
}
}
- if ( !ok && showUsage )
+ if ( !ok && errorMsg.length() != 0 )
{
- Usage();
+ wxString usage;
+ wxMessageOutput* msgOut = wxMessageOutput::Get();
+ if ( showUsage ) usage = GetUsageString();
+ if ( msgOut )
+ msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() );
}
return ok ? 0 : helpRequested ? -1 : 1;
// ----------------------------------------------------------------------------
void wxCmdLineParser::Usage()
+{
+ wxString usage = GetUsageString();
+ wxMessageOutput* msgOut = wxMessageOutput::Get();
+ if ( msgOut )
+ msgOut->Printf( wxT("%s"), usage.c_str() );
+}
+
+wxString wxCmdLineParser::GetUsageString()
{
wxString appname = wxTheApp->GetAppName();
if ( !appname )
{
- wxCHECK_RET( !m_data->m_arguments.IsEmpty(), _T("no program name") );
+ wxCHECK_MSG( !m_data->m_arguments.IsEmpty(), wxEmptyString,
+ _T("no program name") );
appname = wxFileNameFromPath(m_data->m_arguments[0]);
wxStripExtension(appname);
// we construct the brief cmd line desc on the fly, but not the detailed
// help message below because we want to align the options descriptions
// and for this we must first know the longest one of them
- wxString brief;
+ wxString usage;
wxArrayString namesOptions, descOptions;
- brief.Printf(_("Usage: %s"), appname.c_str());
+
+ if ( !!m_data->m_logo )
+ {
+ usage << m_data->m_logo << _T('\n');
+ }
+
+ usage << wxString::Format(_("Usage: %s"), appname.c_str());
// the switch char is usually '-' but this can be changed with
// SetSwitchChars() and then the first one of possible chars is used
{
wxCmdLineOption& opt = m_data->m_options[n];
- brief << _T(' ');
+ usage << _T(' ');
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- brief << _T('[');
+ usage << _T('[');
}
if ( !opt.shortName.empty() )
{
- brief << chSwitch << opt.shortName;
+ usage << chSwitch << opt.shortName;
}
else if ( areLongOptionsEnabled && !opt.longName.empty() )
{
- brief << _T("--") << opt.longName;
+ usage << _T("--") << opt.longName;
}
else
{
{
wxString val;
val << _T('<') << GetTypeName(opt.type) << _T('>');
- brief << _T(' ') << val;
+ usage << _T(' ') << val;
option << (!opt.longName ? _T(':') : _T('=')) << val;
}
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- brief << _T(']');
+ usage << _T(']');
}
namesOptions.Add(option);
{
wxCmdLineParam& param = m_data->m_paramDesc[n];
- brief << _T(' ');
+ usage << _T(' ');
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- brief << _T('[');
+ usage << _T('[');
}
- brief << param.description;
+ usage << param.description;
if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
{
- brief << _T("...");
+ usage << _T("...");
}
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- brief << _T(']');
+ usage << _T(']');
}
}
- if ( !!m_data->m_logo )
- {
- wxLogMessage(m_data->m_logo);
- }
-
- // in console mode we want to show the brief usage message first, then the
- // detailed one but in GUI build we give the details first and then the
- // summary - like this, the brief message appears in the wxLogGui dialog,
- // as expected
-#if !wxUSE_GUI
- wxLogMessage(brief);
-#endif // !wxUSE_GUI
+ usage << _T('\n');
// now construct the detailed help message
size_t len, lenMax = 0;
lenMax = len;
}
- wxString detailed;
for ( n = 0; n < count; n++ )
{
len = namesOptions[n].length();
- detailed << namesOptions[n]
- << wxString(_T(' '), lenMax - len) << _T('\t')
- << descOptions[n]
- << _T('\n');
+ usage << namesOptions[n]
+ << wxString(_T(' '), lenMax - len) << _T('\t')
+ << descOptions[n]
+ << _T('\n');
}
- wxLogMessage(detailed);
-
- // do it now if not done above
-#if wxUSE_GUI
- wxLogMessage(brief);
-#endif // wxUSE_GUI
+ return usage;
}
// ----------------------------------------------------------------------------
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: common/msgout.cpp
+// Purpose: wxMessageOutput implementation
+// Author: Mattia Barbon
+// Modified by:
+// Created: 17.07.02
+// RCS-ID: $Id$
+// Copyright: (c) the wxWindows team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+#ifdef __GNUG__
+ #pragma implementation "msgout.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+ #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/ffile.h"
+ #include "wx/app.h"
+ #if wxUSE_GUI
+ #include "wx/msgdlg.h"
+ #endif // wxUSE_GUI
+#endif
+
+#include "wx/msgout.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
+
+wxMessageOutput* wxMessageOutput::Get()
+{
+ return ms_msgOut;
+}
+
+wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
+{
+ wxMessageOutput* old = ms_msgOut;
+ ms_msgOut = msgout;
+ return old;
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputStderr
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ wxString out;
+
+ out.PrintfV(format, args);
+ va_end(args);
+
+ fprintf(stderr, "%s", out.mb_str());
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputMessageBox
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ wxString out;
+
+ out.PrintfV(format, args);
+ va_end(args);
+
+#ifndef __WXMSW__
+ out.Replace("\t"," ");
+#endif
+ ::wxMessageBox(out);
+}
+
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputLog
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI && defined(__WXMOTIF__)
+
+void wxMessageOutputLog::Printf(const wxChar* format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ wxString out;
+
+ out.PrintfV(format, args);
+ va_end(args);
+
+ out.Replace("\t"," ");
+ // under Motif, wxMessageDialog needs a parent window, so we use
+ // wxLog, which is better than nothing
+ ::wxLogMessage("%s", out.c_str());
+}
+
+#endif // wxUSE_GUI
projects / wxWidgets.git / commitdiff
