compilation fixes for wxUSE_MSGDLG==0

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index f7969c189fa2818143067d7f5151ad2be3a92ecf..5f6604c5b2b1eadcaa418bf17a0647c9bd7bedff 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1742,16 +1742,6 @@
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 

-#if !wxUSE_MSGDLG
-#   ifdef wxABORT_ON_CONFIG_ERROR
-        /* FIXME: should compile without it, of course, but doesn't */
-#       error "wxMessageBox is always needed"
-#   else
-#       undef wxUSE_MSGDLG
-#       define wxUSE_MSGDLG 1
-#   endif
-#endif
-

 #if wxUSE_RADIOBOX
 #   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_RADIOBOX
 #   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 56b11a6244e3136b2e822200b74f19b10297969f..b670f2b65367da62919b7efb94b9acf227ebb75f 100644 (file)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -132,7 +132,7 @@ protected:
 // implementation which shows output in a message box
 // ----------------------------------------------------------------------------
 
 // implementation which shows output in a message box
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG

 
 class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 {
 
 class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 {


@@ -143,7 +143,7 @@ protected:
     virtual void Output(const wxString& str);
 };
 
     virtual void Output(const wxString& str);
 };
 

-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && wxUSE_MSGDLG

 
 // ----------------------------------------------------------------------------
 // implementation using the native way of outputting debug messages
 
 // ----------------------------------------------------------------------------
 // implementation using the native way of outputting debug messages

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 618ace720ea3c7f3adb5820c1526271c527f9b1c..ec85ee9c13b5d85b5a24ecad97bbfc09106d6a64 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -209,7 +209,7 @@ void wxMessageOutputLog::Output(const wxString& str)
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG

 
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
 
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 13ccfb0e473255e084b9ab8a4b51c4e80a8d8a3c..a48533d9689d1448a0e2811879f689ea18e4902a 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -2348,9 +2348,9 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
         wxMessageBox(msg, _T("wxWidgets information"),
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
         wxMessageBox(msg, _T("wxWidgets information"),
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);

+#endif // wxUSE_MSGDLG

     }
     else
     }
     else

-#endif // wxUSE_MSGDLG

     {
         event.Skip();
     }
     {
         event.Skip();
     }