Be nice to eVC++ build process and don't include not existing files.

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

diff --git a/include/wx/access.h b/include/wx/access.h
index 5b29ada9bac4b21466b2d3f11112714160638c01..4e674f0e7f0542a50c34af9c9c10eb2176de1c29 100644 (file)
--- a/include/wx/access.h
+++ b/include/wx/access.h
@@ -16,6 +16,8 @@
 // headers we have to include here
 // ----------------------------------------------------------------------------
 
 // headers we have to include here
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+

 #include "wx/variant.h"
 
 typedef enum
 #include "wx/variant.h"
 
 typedef enum


@@ -363,20 +365,7 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/ole/access.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/ole/access.h"

-#elif defined(__WXMOTIF__)
-    #include "wx/generic/access.h"
-#elif defined(__WXMGL__)
-    #include "wx/generic/access.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/access.h"
-#elif defined(__WXX11__)
-    #include "wx/generic/access.h"
-#elif defined(__WXMAC__)
-    #include "wx/generic/access.h"
-#elif defined(__WXPM__)
-    #include "wx/generic/access.h"

 #endif
 
 #endif
     // _WX_ACCESSBASE_H_
 #endif
 
 #endif
     // _WX_ACCESSBASE_H_

-

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index aa9143a697b15f5600bdd06c48478248dd29428d..f6756133b1b54cd9d692299832008c1f72a4bd6c 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -255,22 +255,22 @@ enum wxDataViewColumnSizing
 class wxDataViewColumnBase: public wxObject
 {
 public:
 class wxDataViewColumnBase: public wxObject
 {
 public:

-    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, 
+    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,

         int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
     ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();
         int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
     ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();

-    
+

     wxDataViewCell* GetCell()               { return m_cell; }
 
     size_t GetModelColumn()                 { return m_model_column; }
 
     void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
     wxDataViewCtrl *GetOwner()              { return m_owner; }
     wxDataViewCell* GetCell()               { return m_cell; }
 
     size_t GetModelColumn()                 { return m_model_column; }
 
     void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
     wxDataViewCtrl *GetOwner()              { return m_owner; }

-    
+

     virtual int GetWidth() = 0;
     virtual int GetWidth() = 0;

-    
+

     virtual void SetFixedWidth( int width ) = 0;
     virtual int GetFixedWidth() = 0;
 
     virtual void SetFixedWidth( int width ) = 0;
     virtual int GetFixedWidth() = 0;
 


@@ -325,7 +325,8 @@ protected:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dataview.h"
+    // TODO
+    // #include "wx/mac/dataview.h"

 #else
     #include "wx/generic/dataview.h"
 #endif
 #else
     #include "wx/generic/dataview.h"
 #endif

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 83192210aa67f0525532bd7758dba1037fc38eba..d66f010f170917673fd66807a1d69106a084cc64 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -63,8 +63,6 @@ enum
        #include "wx/msw/tbar95.h"
     #elif defined(__WXWINCE__)
        #include "wx/msw/wince/tbarwce.h"
        #include "wx/msw/tbar95.h"
     #elif defined(__WXWINCE__)
        #include "wx/msw/wince/tbarwce.h"

-    #elif defined(__WXMSW__)
-       #include "wx/msw/tbarmsw.h"

     #elif defined(__WXMOTIF__)
        #include "wx/motif/toolbar.h"
     #elif defined(__WXGTK20__)
     #elif defined(__WXMOTIF__)
        #include "wx/motif/toolbar.h"
     #elif defined(__WXGTK20__)