Compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index e240323e8cd968f978e2c73421787302c352641a..5dc07458176a756638b2ffa6868b8a5578396903 100644 (file)
--- a/configure.in
+++ b/configure.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

diff --git a/src/Makefile.am b/src/Makefile.am
index d71a0c026c42bb69ee28b13f93ab4b0eef844737..60d2de7b85a510201d619b949c5f880e52ea43b8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,4 +4,4 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = common generic ${SRC_SUBDIRS} ${TOOLKIT_DIR}
+SUBDIRS = ${TOOLKIT_DIR}

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 114771cbb9ccfe6bcd29f2242d38e6d32512df07..755f2ccbb3f19184b2cc267fd39401c68296bee5 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -22,8 +22,10 @@
 
 #ifndef WX_PRECOMP
    #include "wx/window.h"
+#ifdef __WXMSW__
    #include "wx/msw/private.h"
 #endif
+#endif
 
 #include "wx/dc.h"
 

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 7c350059690140ad58939e296c8b8933b9fd0d62..2f8b2c0a0ab1747e00b6bb70f23da8ad2fc5022a 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -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>