fixed wxBase compilation (what was msgdlg.h doing in wxchar.cpp?)

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 19ddb1965c59f9a25e24a2cbfa380ec716bdac97..fec6879ea6336c67bc1bbb519a75eff6ea584d73 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -112,6 +112,7 @@ wxAppBase::~wxAppBase()
 }
 
 #if wxUSE_GUI
 }
 
 #if wxUSE_GUI

+

 bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__
 bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__


@@ -124,7 +125,6 @@ bool wxAppBase::OnInitGui()
 
     return TRUE;
 }
 
     return TRUE;
 }

-#endif // wxUSE_GUI

 
 int wxAppBase::OnRun()
 {
 
 int wxAppBase::OnRun()
 {


@@ -139,6 +139,8 @@ int wxAppBase::OnRun()
     return MainLoop();
 }
 
     return MainLoop();
 }
 

+#endif // wxUSE_GUI
+

 int wxAppBase::OnExit()
 {
 #if wxUSE_CONFIG
 int wxAppBase::OnExit()
 {
 #if wxUSE_CONFIG

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index e625460013de86450484b689b9af9135fba6f129..2f030b8ed9152c38e54c50eff5761184cf01cf83 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -40,8 +40,6 @@
   #include "wx/hash.h"
 #endif
 
   #include "wx/hash.h"
 #endif
 

-#include "wx/msgdlg.h"
-

 #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
   #include <windef.h>
   #include <winbase.h>
 #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
   #include <windef.h>
   #include <winbase.h>