Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cf3bc0
)
XABSearchPanel/frmSearch: common/preferences.h include missing
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Wed, 8 Mar 2017 23:27:52 +0000
(23:27 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Wed, 8 Mar 2017 23:27:52 +0000
(23:27 +0000)
source/search/XABSearchPanel.cpp
patch
|
blob
|
history
source/search/XABSearchPanel.h
patch
|
blob
|
history
source/search/frmSearch.cpp
patch
|
blob
|
history
source/search/frmSearch.h
patch
|
blob
|
history
diff --git
a/source/search/XABSearchPanel.cpp
b/source/search/XABSearchPanel.cpp
index
7a22155
..
170432b
100644
(file)
--- a/
source/search/XABSearchPanel.cpp
+++ b/
source/search/XABSearchPanel.cpp
@@
-17,11
+17,6
@@
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "XABSearchPanel.h"
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "XABSearchPanel.h"
-#include "../bitmaps.h"
-
-#include <wx/mstream.h>
-
-
DEFINE_EVENT_TYPE(XABSP_ENABLECONTROLS);
DEFINE_EVENT_TYPE(XABSP_DISABLECONTROLS);
DEFINE_EVENT_TYPE(XABSP_ENABLECONTROLS);
DEFINE_EVENT_TYPE(XABSP_DISABLECONTROLS);
diff --git
a/source/search/XABSearchPanel.h
b/source/search/XABSearchPanel.h
index
6b524b2
..
a21ef87
100644
(file)
--- a/
source/search/XABSearchPanel.h
+++ b/
source/search/XABSearchPanel.h
@@
-24,8
+24,13
@@
Subclass of XABSearchPanelADT, which is generated by wxFormBuilder.
*/
Subclass of XABSearchPanelADT, which is generated by wxFormBuilder.
*/
+#include <wx/mstream.h>
+
#include "../AppXestiaAddrBk.h"
#include "../AppXestiaAddrBk.h"
+
+#include "../common/preferences.h"
#include "frmSearch.h"
#include "frmSearch.h"
+#include "../bitmaps.h"
//// end generated include
//// end generated include
diff --git
a/source/search/frmSearch.cpp
b/source/search/frmSearch.cpp
index
b2d1ac3
..
8d8530c
100644
(file)
--- a/
source/search/frmSearch.cpp
+++ b/
source/search/frmSearch.cpp
@@
-17,14
+17,7
@@
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmSearch.h"
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmSearch.h"
-#include "../frmMain.h"
-#include "../frmContact.h"
-#include "frmSearchAccounts.h"
-#include "../common/preferences.h"
-#include "../common/dirs.h"
-#include "../vcard/vcard.h"
-
-#include <thread>
+
#define SEARCHSETTINGS_MAX 15
#define SEARCHSETTINGS_MAX 15
diff --git
a/source/search/frmSearch.h
b/source/search/frmSearch.h
index
088818f
..
eab1645
100644
(file)
--- a/
source/search/frmSearch.h
+++ b/
source/search/frmSearch.h
@@
-30,6
+30,14
@@
Subclass of frmSearchADT, which is generated by wxFormBuilder.
#include "XABSearchPanel.h"
#include "../bitmaps.h"
#include "XABSearchPanel.h"
#include "../bitmaps.h"
+#include "../frmMain.h"
+#include "../frmContact.h"
+#include "frmSearchAccounts.h"
+#include "../common/preferences.h"
+#include "../common/dirs.h"
+#include "../vcard/vcard.h"
+
+#include <thread>
#include <map>
#include <wx/fs_mem.h>
#include <wx/tokenzr.h>
#include <map>
#include <wx/fs_mem.h>
#include <wx/tokenzr.h>
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy