Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for wxUSE_MSGDLG==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-11 00:02:51 +00:00
parent c052164410
commit fae8664187
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/chkconf.h
View File

@@ -1742,16 +1742,6 @@
# endif # endif
#endif /* !wxUSE_IMAGLIST */ #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_RADIOBOX
# if !wxUSE_RADIOBTN # if !wxUSE_RADIOBTN
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR

4
include/wx/msgout.h
View File

@@ -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

2
src/common/msgout.cpp
View File

@@ -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)
{ {

2
src/common/wincmn.cpp
View File

@@ -2348,9 +2348,9 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
wxMessageBox(msg, _T("wxWidgets information"), wxMessageBox(msg, _T("wxWidgets information"),
wxICON_INFORMATION | wxOK, wxICON_INFORMATION | wxOK,
(wxWindow *)this); (wxWindow *)this);
#endif // wxUSE_MSGDLG
} }
else else
#endif // wxUSE_MSGDLG
{ {
event.Skip(); event.Skip();
} }