added IMPLEMENT_APP_CONSOLE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index 39550b591cd86e425d928d248377f09937e6e638..e914e20c3c597a3481660588ac39c07a093509e9 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -64,7 +64,7 @@ private:
     int retCode;
 };
 
     int retCode;
 };
 

-IMPLEMENT_APP_NO_THEMES(XmlResApp)
+IMPLEMENT_APP_CONSOLE(XmlResApp)

 
 int XmlResApp::OnRun()
 {
 
 int XmlResApp::OnRun()
 {

diff --git a/include/wx/app.h b/include/wx/app.h
index 07d930dff4cce57aab9ca4d66cfee60d1c08c155..edd3eef48865a0ff307693c7e9911a9ec1777490 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -597,9 +597,12 @@ public:
 // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
 // code if required.
 
 // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
 // code if required.
 

+#define IMPLEMENT_WXWIN_MAIN_CONSOLE \
+        int main(int argc, char **argv) { return wxEntry(argc, argv); }
+

 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \
 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \

-        int main(int argc, char **argv) { return wxEntry(argc, argv); }
+        IMPLEMENT_WXWIN_MAIN_CONSOLE

 #elif defined(__WXMSW__)
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 #elif defined(__WXMSW__)
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"


@@ -661,6 +664,11 @@ public:
     IMPLEMENT_APP_NO_THEMES(appname)        \
     IMPLEMENT_WX_THEME_SUPPORT
 
     IMPLEMENT_APP_NO_THEMES(appname)        \
     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()
 // function
 #define DECLARE_APP(appname) extern appname& wxGetApp();
 // this macro can be used multiple times and just allows you to use wxGetApp()
 // function
 #define DECLARE_APP(appname) extern appname& wxGetApp();

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 39550b591cd86e425d928d248377f09937e6e638..e914e20c3c597a3481660588ac39c07a093509e9 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -64,7 +64,7 @@ private:
     int retCode;
 };
 
     int retCode;
 };
 

-IMPLEMENT_APP_NO_THEMES(XmlResApp)
+IMPLEMENT_APP_CONSOLE(XmlResApp)

 
 int XmlResApp::OnRun()
 {
 
 int XmlResApp::OnRun()
 {