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

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

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"

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
 

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

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)

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

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)

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"

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"

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

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"
 

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"

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