From 2a673eb1c9942cbdda6486bda330aeef0d43321a Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 1 Jun 2006 08:23:42 +0000 Subject: [PATCH] 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 | 3 ++- src/common/lboxcmn.cpp | 3 ++- src/generic/grid.cpp | 5 +---- src/generic/listctrl.cpp | 19 ++++++++----------- src/generic/treectlg.cpp | 5 +---- src/generic/vlbox.cpp | 8 ++++---- src/mac/classic/window.cpp | 2 +- src/msw/listbox.cpp | 3 ++- src/os2/checklst.cpp | 2 +- src/univ/themes/win32.cpp | 1 - src/x11/window.cpp | 2 +- src/xrc/xh_listb.cpp | 7 +++---- 12 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm index 37eb935a7b..c24e9b9439 100644 --- 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 6350c107f2..e1b8432136 100644 --- 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 f54c31bd7e..2bebd87e64 100644 --- 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 d82d81b332..4eccdff7f6 100644 --- 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 fa66da1ac6..963964e391 100644 --- 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 d53213a284..0195b3e4c0 100644 --- 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 0e5d2ca672..16b32b0496 100644 --- 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 f2507cf98f..0801c0fc79 100644 --- 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 4be739ef63..305237d43b 100644 --- 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 48959999ee..8b9b052077 100644 --- 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 edcaa1015b..87b10a03cb 100644 --- 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 300b657a81..0deaa03bed 100644 --- 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 -- 2.45.2