partially applied patch #895170: "Building with minimal setup.h - continuation"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
@@ -14,15 +14,11 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_BUTTON
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxButton flags
|
||||
// wxButton flags shared with other classes
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// These two flags are obsolete
|
||||
#define wxBU_NOAUTODRAW 0x0000
|
||||
#define wxBU_AUTODRAW 0x0004
|
||||
#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
|
||||
|
||||
// These flags affect label alignment
|
||||
#define wxBU_LEFT 0x0040
|
||||
@@ -30,6 +26,18 @@
|
||||
#define wxBU_RIGHT 0x0100
|
||||
#define wxBU_BOTTOM 0x0200
|
||||
|
||||
#endif
|
||||
|
||||
#if wxUSE_BUTTON
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxButton specific flags
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// These two flags are obsolete
|
||||
#define wxBU_NOAUTODRAW 0x0000
|
||||
#define wxBU_AUTODRAW 0x0004
|
||||
|
||||
// by default, the buttons will be created with some (system dependent)
|
||||
// minimal size to make them look nicer, giving this style will make them as
|
||||
// small as possible
|
||||
|
||||
@@ -946,6 +946,17 @@
|
||||
# endif
|
||||
#endif /* controls */
|
||||
|
||||
#if wxUSE_BMPBUTTON
|
||||
# if !wxUSE_BUTTON
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_BMPBUTTON requires wxUSE_BUTTON"
|
||||
# else
|
||||
# undef wxUSE_BUTTON
|
||||
# define wxUSE_BUTTON 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_BMPBUTTON */
|
||||
|
||||
#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK
|
||||
# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
@@ -1201,6 +1212,17 @@
|
||||
# endif
|
||||
#endif /* wxUSE_RADIOBTN */
|
||||
|
||||
#if wxUSE_HELP
|
||||
# if !wxUSE_BMPBUTTON
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_HELP requires wxUSE_BMPBUTTON"
|
||||
# else
|
||||
# undef wxUSE_BMPBUTTON
|
||||
# define wxUSE_BMPBUTTON 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_HELP */
|
||||
|
||||
#if wxUSE_WXHTML_HELP
|
||||
# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
@@ -1378,6 +1400,25 @@
|
||||
# endif
|
||||
#endif /* wxUSE_FILEDLG */
|
||||
|
||||
#if !wxUSE_BUTTON
|
||||
# if wxUSE_PROGRESSDLG || \
|
||||
wxUSE_FONTDLG || \
|
||||
wxUSE_FILEDLG || \
|
||||
wxUSE_CHOICEDLG || \
|
||||
wxUSE_NUMBERDLG || \
|
||||
wxUSE_TEXTDLG || \
|
||||
wxUSE_DIRDLG || \
|
||||
wxUSE_STARTUP_TIPS || \
|
||||
wxUSE_WIZARDDLG
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "Common and generic dialogs require wxUSE_BUTTON"
|
||||
# else
|
||||
# undef wxUSE_BUTTON
|
||||
# define wxUSE_BUTTON 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_PROGRESSDLG */
|
||||
|
||||
#if !wxUSE_TOOLBAR
|
||||
# if wxUSE_TOOLBAR_NATIVE
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
@@ -1444,12 +1485,14 @@
|
||||
#endif /* wxUSE_LOGWINDOW */
|
||||
|
||||
#if wxUSE_LOG_DIALOG
|
||||
# if !wxUSE_LISTCTRL
|
||||
# if !wxUSE_LISTCTRL || !wxUSE_BUTTON
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL"
|
||||
# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL and wxUSE_BUTTON"
|
||||
# else
|
||||
# undef wxUSE_LISTCTRL
|
||||
# define wxUSE_LISTCTRL 1
|
||||
# undef wxUSE_BUTTON
|
||||
# define wxUSE_BUTTON 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_LOG_DIALOG */
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
#ifndef _WX_CHOICDLG_H_BASE_
|
||||
#define _WX_CHOICDLG_H_BASE_
|
||||
|
||||
#if wxUSE_CHOICEDLG
|
||||
|
||||
#include "wx/generic/choicdgg.h"
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// _WX_CHOICDLG_H_BASE_
|
||||
|
||||
@@ -18,6 +18,24 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// common constants for use in wxUSE_LOG/!wxUSE_LOG
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// the trace masks have been superceded by symbolic trace constants, they're
|
||||
// for compatibility only andwill be removed soon - do NOT use them
|
||||
|
||||
// meaning of different bits of the trace mask (which allows selectively
|
||||
// enable/disable some trace messages)
|
||||
#define wxTraceMemAlloc 0x0001 // trace memory allocation (new/delete)
|
||||
#define wxTraceMessages 0x0002 // trace window messages/X callbacks
|
||||
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation
|
||||
#define wxTraceRefCount 0x0008 // trace various ref counting operations
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#define wxTraceOleCalls 0x0100 // OLE interface calls
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// types
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -93,20 +111,6 @@ enum
|
||||
#define wxTRACE_OleCalls wxT("ole") // OLE interface calls
|
||||
#endif
|
||||
|
||||
// the trace masks have been superceded by symbolic trace constants, they're
|
||||
// for compatibility only andwill be removed soon - do NOT use them
|
||||
|
||||
// meaning of different bits of the trace mask (which allows selectively
|
||||
// enable/disable some trace messages)
|
||||
#define wxTraceMemAlloc 0x0001 // trace memory allocation (new/delete)
|
||||
#define wxTraceMessages 0x0002 // trace window messages/X callbacks
|
||||
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation
|
||||
#define wxTraceRefCount 0x0008 // trace various ref counting operations
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#define wxTraceOleCalls 0x0100 // OLE interface calls
|
||||
#endif
|
||||
|
||||
#include "wx/iosfwrap.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -444,9 +448,6 @@ extern void expdecl wxVLog##level(arg, const wxChar *szFormat, \
|
||||
va_list argptr); \
|
||||
extern void expdecl wxLog##level(arg, const wxChar *szFormat, \
|
||||
...) ATTRIBUTE_PRINTF_2
|
||||
#define DECLARE_LOG_FUNCTION2(level, arg) \
|
||||
DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE)
|
||||
|
||||
#else // !wxUSE_LOG
|
||||
|
||||
// log functions do nothing at all
|
||||
@@ -454,7 +455,7 @@ extern void expdecl wxLog##level(arg, const wxChar *szFormat, \
|
||||
inline void wxVLog##level(const wxChar *szFormat, \
|
||||
va_list argptr) { } \
|
||||
inline void wxLog##level(const wxChar *szFormat, ...) { }
|
||||
#define DECLARE_LOG_FUNCTION2(level, arg) \
|
||||
#define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl) \
|
||||
inline void wxVLog##level(arg, const wxChar *szFormat, \
|
||||
va_list argptr) {} \
|
||||
inline void wxLog##level(arg, const wxChar *szFormat, ...) { }
|
||||
@@ -474,6 +475,9 @@ public:
|
||||
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls
|
||||
|
||||
#endif // wxUSE_LOG/!wxUSE_LOG
|
||||
#define DECLARE_LOG_FUNCTION2(level, arg) \
|
||||
DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE)
|
||||
|
||||
|
||||
// a generic function for all levels (level is passes as parameter)
|
||||
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);
|
||||
@@ -492,6 +496,7 @@ DECLARE_LOG_FUNCTION(Status);
|
||||
|
||||
#if wxUSE_GUI
|
||||
// this one is the same as previous except that it allows to explicitly
|
||||
class wxFrame;
|
||||
// specify the frame to which the output should go
|
||||
DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *pFrame, WXDLLIMPEXP_CORE);
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
Reference in New Issue
Block a user