added IMPLEMENT_APP_CONSOLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,7 +64,7 @@ private:
|
|||||||
int retCode;
|
int retCode;
|
||||||
};
|
};
|
||||||
|
|
||||||
IMPLEMENT_APP_NO_THEMES(XmlResApp)
|
IMPLEMENT_APP_CONSOLE(XmlResApp)
|
||||||
|
|
||||||
int XmlResApp::OnRun()
|
int XmlResApp::OnRun()
|
||||||
{
|
{
|
||||||
|
@@ -597,9 +597,12 @@ public:
|
|||||||
// be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
|
// be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
|
||||||
// code if required.
|
// code if required.
|
||||||
|
|
||||||
|
#define IMPLEMENT_WXWIN_MAIN_CONSOLE \
|
||||||
|
int main(int argc, char **argv) { return wxEntry(argc, argv); }
|
||||||
|
|
||||||
#if !wxUSE_GUI || !defined(__WXMSW__)
|
#if !wxUSE_GUI || !defined(__WXMSW__)
|
||||||
#define IMPLEMENT_WXWIN_MAIN \
|
#define IMPLEMENT_WXWIN_MAIN \
|
||||||
int main(int argc, char **argv) { return wxEntry(argc, argv); }
|
IMPLEMENT_WXWIN_MAIN_CONSOLE
|
||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
// we need HINSTANCE declaration to define WinMain()
|
// we need HINSTANCE declaration to define WinMain()
|
||||||
#include "wx/msw/wrapwin.h"
|
#include "wx/msw/wrapwin.h"
|
||||||
@@ -661,6 +664,11 @@ public:
|
|||||||
IMPLEMENT_APP_NO_THEMES(appname) \
|
IMPLEMENT_APP_NO_THEMES(appname) \
|
||||||
IMPLEMENT_WX_THEME_SUPPORT
|
IMPLEMENT_WX_THEME_SUPPORT
|
||||||
|
|
||||||
|
// Same as IMPLEMENT_APP(), but for console applications.
|
||||||
|
#define IMPLEMENT_APP_CONSOLE(appname) \
|
||||||
|
IMPLEMENT_APP_NO_MAIN(appname) \
|
||||||
|
IMPLEMENT_WXWIN_MAIN_CONSOLE
|
||||||
|
|
||||||
// this macro can be used multiple times and just allows you to use wxGetApp()
|
// this macro can be used multiple times and just allows you to use wxGetApp()
|
||||||
// function
|
// function
|
||||||
#define DECLARE_APP(appname) extern appname& wxGetApp();
|
#define DECLARE_APP(appname) extern appname& wxGetApp();
|
||||||
|
@@ -64,7 +64,7 @@ private:
|
|||||||
int retCode;
|
int retCode;
|
||||||
};
|
};
|
||||||
|
|
||||||
IMPLEMENT_APP_NO_THEMES(XmlResApp)
|
IMPLEMENT_APP_CONSOLE(XmlResApp)
|
||||||
|
|
||||||
int XmlResApp::OnRun()
|
int XmlResApp::OnRun()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user