Compile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1909,11 +1909,7 @@ AC_OUTPUT([
|
||||
wx-config
|
||||
Makefile
|
||||
src/Makefile
|
||||
src/common/Makefile
|
||||
src/generic/Makefile
|
||||
src/gtk/Makefile
|
||||
src/motif/Makefile
|
||||
src/unix/Makefile
|
||||
include/Makefile
|
||||
include/wx/Makefile
|
||||
include/wx/generic/Makefile
|
||||
|
@@ -4,4 +4,4 @@
|
||||
##
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
SUBDIRS = common generic ${SRC_SUBDIRS} ${TOOLKIT_DIR}
|
||||
SUBDIRS = ${TOOLKIT_DIR}
|
||||
|
@@ -22,8 +22,10 @@
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/window.h"
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/msw/private.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "wx/dc.h"
|
||||
|
||||
|
@@ -30,22 +30,24 @@
|
||||
// wxWindows
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/window.h"
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/msw/private.h"
|
||||
#include <wx/event.h>
|
||||
#include <wx/app.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/menu.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/msgdlg.h>
|
||||
#include <wx/filedlg.h>
|
||||
#include <wx/textctrl.h>
|
||||
#endif
|
||||
#include "wx/event.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/intl.h"
|
||||
#include "wx/menu.h"
|
||||
#include "wx/frame.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#include "wx/filedlg.h"
|
||||
#include "wx/textctrl.h"
|
||||
#endif //WX_PRECOMP
|
||||
|
||||
#include <wx/file.h>
|
||||
#include <wx/textfile.h>
|
||||
#include <wx/utils.h>
|
||||
#include <wx/log.h>
|
||||
#include "wx/file.h"
|
||||
#include "wx/textfile.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
// other standard headers
|
||||
#include <errno.h>
|
||||
|
Reference in New Issue
Block a user