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

allow compilation with wxUSE_CHOICEDLG set to 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-05-30 15:59:19 +00:00
parent 0b4f47a319
commit adb799d6ef
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/chkconf.h
View File

@@ -1221,6 +1221,15 @@
# define wxUSE_BMPBUTTON 1 # define wxUSE_BMPBUTTON 1
# endif # endif
# endif # endif
# if !wxUSE_CHOICEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_HELP requires wxUSE_CHOICEDLG"
# else
# undef wxUSE_CHOICEDLG
# define wxUSE_CHOICEDLG 1
# endif
# endif
#endif /* wxUSE_HELP */ #endif /* wxUSE_HELP */
#if wxUSE_WXHTML_HELP #if wxUSE_WXHTML_HELP
@@ -1348,6 +1357,15 @@
# endif # endif
# endif # endif
# if !wxUSE_CHOICEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "DocView requires wxUSE_CHOICEDLG"
# else
# undef wxUSE_CHOICEDLG
# define wxUSE_CHOICEDLG 1
# endif
# endif
# if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM # if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM" # error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"

4
src/common/fontmap.cpp
View File

@@ -175,6 +175,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
// chosen to suppress this the last time) // chosen to suppress this the last time)
encoding = wxFONTENCODING_SYSTEM; encoding = wxFONTENCODING_SYSTEM;
} }
#if wxUSE_CHOICEDLG
else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive ) else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
{ {
// prepare the dialog data // prepare the dialog data
@@ -233,6 +234,9 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
} }
#endif // wxUSE_CONFIG #endif // wxUSE_CONFIG
} }
#else
wxUnusedVar(interactive);
#endif // wxUSE_CHOICEDLG
return (wxFontEncoding)encoding; return (wxFontEncoding)encoding;
} }