#include "wx/app.h"
#include "wx/intl.h"
#include "wx/list.h"
- #if wxUSE_LOG
- #include "wx/log.h"
- #endif // wxUSE_LOG
+ #include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/utils.h"
#endif //Win/Unix
#if defined(__WXMSW__)
- #include "wx/msw/private.h" // includes windows.h for MessageBox()
+ #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox()
#endif
#if wxUSE_FONTMAP
#ifdef __WXDEBUG__
SetTraceMasks();
+#if wxUSE_UNICODE
+ // In unicode mode the SetTraceMasks call can cause an apptraits to be
+ // created, but since we are still in the constructor the wrong kind will
+ // be created for GUI apps. Destroy it so it can be created again later.
+ delete m_traits;
+ m_traits = NULL;
+#endif
#endif
}
bool wxAppConsole::Initialize(int& argc, wxChar **argv)
{
+#if wxUSE_LOG
+ // If some code logged something before wxApp instance was created,
+ // wxLogStderr was set as the target. Undo it here by destroying the
+ // current target. It will be re-created next time logging is needed, but
+ // this time wxAppTraits will be used:
+ delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+
// remember the command line arguments
this->argc = argc;
this->argv = argv;
OnInitCmdLine(parser);
bool cont;
- switch ( parser.Parse(FALSE /* don't show usage */) )
+ switch ( parser.Parse(false /* don't show usage */) )
{
case -1:
cont = OnCmdLineHelp(parser);
}
if ( !cont )
- return FALSE;
+ return false;
#endif // wxUSE_CMDLINE_PARSER
- return TRUE;
+ return true;
}
int wxAppConsole::OnExit()
delete wxConfigBase::Set((wxConfigBase *) NULL);
#endif // wxUSE_CONFIG
-#ifdef __WXUNIVERSAL__
- delete wxTheme::Set(NULL);
-#endif // __WXUNIVERSAL__
-
// use Set(NULL) and not Get() to avoid creating a message output object on
// demand when we just want to delete it
delete wxMessageOutput::Set(NULL);
return -1;
}
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXCEPTIONS
+
+void
+wxAppConsole::HandleEvent(wxEvtHandler *handler,
+ wxEventFunction func,
+ wxEvent& event) const
+{
+ // by default, simply call the handler
+ (handler->*func)(event);
+}
+
+bool
+wxAppConsole::OnExceptionInMainLoop()
+{
+ throw;
+
+ // some compilers are too stupid to know that we never return after throw
+#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
+ return false;
+#endif
+}
+
+#endif // wxUSE_EXCEPTIONS
+
// ----------------------------------------------------------------------------
// cmd line parsing
// ----------------------------------------------------------------------------
#if wxUSE_CMDLINE_PARSER
#define OPTION_VERBOSE _T("verbose")
-#define OPTION_THEME _T("theme")
-#define OPTION_MODE _T("mode")
void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
{
},
#endif // wxUSE_LOG
-#ifdef __WXUNIVERSAL__
- {
- wxCMD_LINE_OPTION,
- _T(""),
- OPTION_THEME,
- gettext_noop("specify the theme to use"),
- wxCMD_LINE_VAL_STRING,
- 0x0
- },
-#endif // __WXUNIVERSAL__
-
-#if defined(__WXMGL__)
- // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
- // should provide this option. That's why it is in common/appcmn.cpp
- // and not mgl/app.cpp
- {
- wxCMD_LINE_OPTION,
- _T(""),
- OPTION_MODE,
- gettext_noop("specify display mode to use (e.g. 640x480-16)"),
- wxCMD_LINE_VAL_STRING,
- 0x0
- },
-#endif // __WXMGL__
-
// terminator
{
wxCMD_LINE_NONE,
#if wxUSE_LOG
if ( parser.Found(OPTION_VERBOSE) )
{
- wxLog::SetVerbose(TRUE);
+ wxLog::SetVerbose(true);
}
+#else
+ wxUnusedVar(parser);
#endif // wxUSE_LOG
-#ifdef __WXUNIVERSAL__
- wxString themeName;
- if ( parser.Found(OPTION_THEME, &themeName) )
- {
- wxTheme *theme = wxTheme::Create(themeName);
- if ( !theme )
- {
- wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
- return FALSE;
- }
-
- // Delete the defaultly created theme and set the new theme.
- delete wxTheme::Get();
- wxTheme::Set(theme);
- }
-#endif // __WXUNIVERSAL__
-
-#if defined(__WXMGL__)
- wxString modeDesc;
- if ( parser.Found(OPTION_MODE, &modeDesc) )
- {
- unsigned w, h, bpp;
- if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
- {
- wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
- return FALSE;
- }
-
- if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
- return FALSE;
- }
-#endif // __WXMGL__
-
- return TRUE;
+ return true;
}
bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
{
parser.Usage();
- return FALSE;
+ return false;
}
bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
{
parser.Usage();
- return FALSE;
+ return false;
}
#endif // wxUSE_CMDLINE_PARSER
// ----------------------------------------------------------------------------
/* static */
-bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& opts)
+bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
+ const char *componentName)
{
-#define wxCMP(what) (what == opts.m_ ## what)
-
- bool
-#ifdef __WXDEBUG__
- isDebug = TRUE;
-#else
- isDebug = FALSE;
+#if 0 // can't use wxLogTrace, not up and running yet
+ printf("checking build options object '%s' (ptr %p) in '%s'\n",
+ optionsSignature, optionsSignature, componentName);
#endif
- int verMaj = wxMAJOR_VERSION,
- verMin = wxMINOR_VERSION;
-
- if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
+ if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )
{
+ wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
+ wxString prog = wxString::FromAscii(optionsSignature);
+ wxString progName = wxString::FromAscii(componentName);
wxString msg;
- wxString libDebug, progDebug;
-
- if (isDebug)
- libDebug = wxT("debug");
- else
- libDebug = wxT("no debug");
-
- if (opts.m_isDebug)
- progDebug = wxT("debug");
- else
- progDebug = wxT("no debug");
-
- msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %d.%d (%s), and your program used %d.%d (%s)."),
- verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
-
- wxLogFatalError(msg);
+
+ msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+ lib.c_str(), progName.c_str(), prog.c_str());
+
+ wxLogFatalError(msg.c_str());
// normally wxLogFatalError doesn't return
- return FALSE;
+ return false;
}
#undef wxCMP
- return TRUE;
+ return true;
}
#ifdef __WXDEBUG__
const wxChar *cond,
const wxChar *msg)
{
- ShowAssertDialog(file, line, cond, msg, m_traits);
+ ShowAssertDialog(file, line, cond, msg, GetTraits());
}
#endif // __WXDEBUG__
// nothing to do
}
+#if wxUSE_SOCKETS
+GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
+{
+ return NULL;
+}
+#endif
+
// ----------------------------------------------------------------------------
// wxAppTraits
// ----------------------------------------------------------------------------
const wxChar *szFile,
int nLine,
const wxChar *szCond,
- const wxChar *szMsg)
+ const wxChar *szMsg)
{
if ( !cond )
wxOnAssert(szFile, nLine, szCond, szMsg);
const wxChar *szMsg)
{
// FIXME MT-unsafe
- static bool s_bInAssert = FALSE;
+ static bool s_bInAssert = false;
if ( s_bInAssert )
{
// He-e-e-e-elp!! we're trapped in endless loop
wxTrap();
- s_bInAssert = FALSE;
+ s_bInAssert = false;
return;
}
- s_bInAssert = TRUE;
+ s_bInAssert = true;
if ( !wxTheApp )
{
wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
}
- s_bInAssert = FALSE;
+ s_bInAssert = false;
}
#endif // __WXDEBUG__
wxT("You can also choose [Cancel] to suppress ")
wxT("further warnings.");
- switch ( ::MessageBox(NULL, msgDlg, _T("wxWindows Debug Alert"),
+ switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),
MB_YESNOCANCEL | MB_ICONSTOP ) )
{
case IDYES:
wxAppTraits *traits)
{
// this variable can be set to true to suppress "assert failure" messages
- static bool s_bNoAsserts = FALSE;
+ static bool s_bNoAsserts = false;
wxString msg;
msg.reserve(2048);
projects / wxWidgets.git / blobdiff