Add missing wxUSE_XXX checks to persistent adapters headers
Make sure these headers can be compiled even when the control they're written for is not available in the build. Including them in this case doesn't make much sense, of course, but not giving any errors is still nicer and consistent with the rest of wx headers.
This commit is contained in:
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "wx/persist/window.h"
|
||||
|
||||
#if wxUSE_BOOKCTRL
|
||||
|
||||
#include "wx/bookctrl.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -63,4 +65,6 @@ inline wxPersistentObject *wxCreatePersistentObject(wxBookCtrlBase *book)
|
||||
return new wxPersistentBookCtrl(book);
|
||||
}
|
||||
|
||||
#endif // wxUSE_BOOKCTRL
|
||||
|
||||
#endif // _WX_PERSIST_BOOKCTRL_H_
|
||||
|
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "wx/persist/window.h"
|
||||
|
||||
#if wxUSE_COMBOBOX
|
||||
|
||||
#include "wx/combobox.h"
|
||||
|
||||
#define wxPERSIST_COMBOBOX_KIND wxASCII_STR("Combobox")
|
||||
@@ -96,4 +98,6 @@ inline wxPersistentObject *wxCreatePersistentObject(wxComboBox* combobox)
|
||||
return new wxPersistentComboBox(combobox);
|
||||
}
|
||||
|
||||
#endif // wxUSE_COMBOBOX
|
||||
|
||||
#endif // _WX_PERSIST_COMBOBOX_H_
|
||||
|
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "wx/persist/window.h"
|
||||
|
||||
#if wxUSE_DATAVIEWCTRL
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -168,4 +170,6 @@ inline wxPersistentObject *wxCreatePersistentObject(wxDataViewCtrl* control)
|
||||
return new wxPersistentDataViewCtrl(control);
|
||||
}
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
||||
#endif // _WX_PERSIST_DATAVIEW_H_
|
||||
|
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "wx/persist/bookctrl.h"
|
||||
|
||||
#if wxUSE_TREEBOOK
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
#include "wx/treebook.h"
|
||||
|
||||
@@ -93,4 +95,6 @@ inline wxPersistentObject *wxCreatePersistentObject(wxTreebook *book)
|
||||
return new wxPersistentTreeBookCtrl(book);
|
||||
}
|
||||
|
||||
#endif // wxUSE_TREEBOOK
|
||||
|
||||
#endif // _WX_PERSIST_TREEBOOK_H_
|
||||
|
Reference in New Issue
Block a user