Include wx/listbox.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index 37eb935a7b481283b8b344b5550d0240c8b8bf18..c24e9b9439dca8fa95d598e7d960fbcfcf8331d5 100644 (file)
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -13,10 +13,11 @@
 
 #if wxUSE_LISTBOX
 
+#include "wx/listbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
-    #include "wx/listbox.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 6350c107f29b0a2b6adf95d69daa7e21facb0d9b..e1b84321368853f631895012bb4cc093f6bb7d06 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -26,9 +26,10 @@
 
 #if wxUSE_LISTBOX
 
+#include "wx/listbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
-    #include "wx/listbox.h"
     #include "wx/arrstr.h"
 #endif
 

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index f54c31bd7edb3ae24e17184c6235212808b1aaf1..2bebd87e647be872aa978bca20da554372042dc0 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -29,6 +29,7 @@
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/math.h"
+    #include "wx/listbox.h"
 #endif
 
 #include "wx/textfile.h"
@@ -4172,10 +4173,6 @@ wxGrid::~wxGrid()
 // be removed as well as the #else cases below.
 #define _USE_VISATTR 0
 
-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-
 void wxGrid::Create()
 {
     // set to true by CreateGrid

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index d82d81b3327b097e633e1b32eb9eb0a351758a64..4eccdff7f6ed82f798fa40aaf89705a0d9aadc6b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -23,13 +23,6 @@
 
 #if wxUSE_LISTCTRL
 
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/app.h"
-    #include "wx/dcscreen.h"
-    #include "wx/textctrl.h"
-#endif
-
 // under Win32 we always use the native version and also may use the generic
 // one, however some things should be done only if we use only the generic
 // version
@@ -51,6 +44,14 @@
     IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
 #endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/app.h"
+    #include "wx/dcscreen.h"
+    #include "wx/textctrl.h"
+    #include "wx/listbox.h"
+#endif
+
 #include "wx/selstore.h"
 #include "wx/renderer.h"
 #include "wx/math.h"
@@ -5448,10 +5449,6 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     return true;
 }
 
-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-
 // static
 wxVisualAttributes
 wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index fa66da1ac62bfca5ace5b41e6e6b61f92a0df88e..963964e3918ced5a6bcdfe5e47328b94e861371c 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -32,6 +32,7 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/listbox.h"
 #endif
 
 #include "wx/generic/treectlg.h"
@@ -3566,10 +3567,6 @@ void wxGenericTreeCtrl::OnGetToolTip( wxTreeEvent &event )
 // be removed, as well as the #else case below.
 #define _USE_VISATTR 0
 
-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-
 //static
 wxVisualAttributes
 #if _USE_VISATTR

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index d53213a28491dc94e142b608157e1ecd16973e21..0195b3e4c073509dee66e0bf027aef12609233e2 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -26,12 +26,14 @@
 
 #if wxUSE_LISTBOX
 
+#include "wx/vlbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/listbox.h"
 #endif //WX_PRECOMP
 
-#include "wx/vlbox.h"
 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
 
@@ -92,7 +94,7 @@ bool wxVListBox::Create(wxWindow *parent,
 
 wxVListBox::~wxVListBox()
 {
-    delete m_doubleBuffer;    
+    delete m_doubleBuffer;
     delete m_selStore;
 }
 
@@ -645,8 +647,6 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 
-#include "wx/listbox.h"
-
 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 0e5d2ca6727783f9a3a92f7c119d43f8d97e633e..16b32b0496b6e7e9822d2a27dff18121d56306f6 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -28,10 +28,10 @@
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"
     #include "wx/statbox.h"
+    #include "wx/listbox.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/listbox.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index f2507cf98f627a9f4289b731b2c47ae4be34f0e6..0801c0fc799166b8ee8358546e02498b9db65278 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -18,9 +18,10 @@
 
 #if wxUSE_LISTBOX
 
+#include "wx/listbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
-    #include "wx/listbox.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 4be739ef637c8f5340c548aa996909cb39a00f33..305237d43b77f4acdf05da1632406f92fe244457 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -27,12 +27,12 @@
     #include "wx/dcmemory.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
+    #include "wx/listbox.h"
 #endif
 
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/bitmap.h"
-#include "wx/listbox.h"
 #include "wx/ownerdrw.h"
 
 #define INCL_PM

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 48959999ee4a9a21ab1a78e84cede9e4f31d9d08..8b9b052077c171204654eb9beee8196c1b74790a 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -40,7 +40,6 @@
     #include "wx/scrolbar.h"
     #include "wx/slider.h"
     #include "wx/textctrl.h"
-    #include "wx/listbox.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
 

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index edcaa1015b0a678496787d9ceeb2cc919acf8c44..87b10a03cb9d2f7a999145499e9370d260814446 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -42,10 +42,10 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"
+    #include "wx/listbox.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/listbox.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index 300b657a81bc616d8d7cefc3e196088e4570290a..0deaa03beddd11f762d3b0625a9b71fd64dc8383 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -15,16 +15,15 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_LISTBOX
 
 #include "wx/xrc/xh_listb.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/listbox.h"
 #endif
 
-#include "wx/listbox.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
 
 wxListBoxXmlHandler::wxListBoxXmlHandler()
@@ -102,4 +101,4 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_LISTBOX