From b20edf8b33e4ffa3a56e65f773e3bf73e13adf81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 26 Jan 2006 19:06:06 +0000 Subject: [PATCH] Better #include git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/console/console.cpp | 6 ++--- samples/dialogs/dialogs.cpp | 2 +- samples/ipc/ipcsetup.h | 2 +- samples/mobile/styles/styles.h | 3 ++- samples/mobile/wxedit/wxedit.h | 3 ++- samples/multimon/multimon_test.cpp | 36 +++++++++++++------------- samples/oleauto/oleauto.cpp | 3 +-- samples/opengl/penguin/dxfrenderer.cpp | 4 +-- samples/toolbar/toolbar.cpp | 2 +- 9 files changed, 31 insertions(+), 30 deletions(-) diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 7348a317d0..91876f7d42 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -897,8 +897,8 @@ static void TestFileNameCwd() #ifdef TEST_FILETIME -#include -#include +#include "wx/filename.h" +#include "wx/datetime.h" static void TestFileGetTimes() { @@ -1554,7 +1554,7 @@ static void TestRegExInteractive() #ifdef TEST_ODBC -#include +#include "wx/db.h" static void TestDbOpen() { diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index d3cdcf1e15..9c4f7eba68 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -40,7 +40,7 @@ #if wxUSE_PROGRESSDLG #if wxUSE_STOPWATCH && wxUSE_LONGLONG - #include // wxDateTime + #include "wx/datetime.h" // wxDateTime #endif #include "wx/progdlg.h" diff --git a/samples/ipc/ipcsetup.h b/samples/ipc/ipcsetup.h index a7e392a7a5..bfd44e56f1 100644 --- a/samples/ipc/ipcsetup.h +++ b/samples/ipc/ipcsetup.h @@ -12,7 +12,7 @@ // You may set this to 0 to prevent DDE from being used even under Windows //#define wxUSE_DDE_FOR_IPC 0 -#include +#include "wx/ipc.h" // the default service name #define IPC_SERVICE _T("4242") diff --git a/samples/mobile/styles/styles.h b/samples/mobile/styles/styles.h index 9a04e8beb1..7570ce7300 100644 --- a/samples/mobile/styles/styles.h +++ b/samples/mobile/styles/styles.h @@ -1,6 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: styles.h // Author: Robert Roebling +// RCS-ID: $Id$ // Created: 04/07/02 ///////////////////////////////////////////////////////////////////////////// @@ -10,7 +11,7 @@ // Include wxWidgets' headers #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif //---------------------------------------------------------------------------- diff --git a/samples/mobile/wxedit/wxedit.h b/samples/mobile/wxedit/wxedit.h index 6bbfb94653..40a80f13bb 100644 --- a/samples/mobile/wxedit/wxedit.h +++ b/samples/mobile/wxedit/wxedit.h @@ -1,6 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wxedit.h // Author: Robert Roebling +// RCS-ID: $Id$ // Created: 04/07/02 ///////////////////////////////////////////////////////////////////////////// @@ -10,7 +11,7 @@ // Include wxWidgets' headers #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif //---------------------------------------------------------------------------- diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp index 3ddf4e93b4..8557897355 100644 --- a/samples/multimon/multimon_test.cpp +++ b/samples/multimon/multimon_test.cpp @@ -9,12 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include -#include +#include "wx/wx.h" +#include "wx/display.h" class TestApp : public wxApp { - bool OnInit(); + bool OnInit(); }; DECLARE_APP(TestApp) @@ -22,7 +22,7 @@ IMPLEMENT_APP(TestApp) bool TestApp::OnInit() { - bool is_use_display = + bool is_use_display = #if wxUSE_DISPLAY true #else @@ -33,22 +33,22 @@ bool TestApp::OnInit() { wxMessageBox( _T("This sample has to be compiled with wxUSE_DISPLAY"), _T("Building error"), wxOK); } - #if wxUSE_DISPLAY +#if wxUSE_DISPLAY else { - size_t count = wxDisplay::GetCount(); + size_t count = wxDisplay::GetCount(); wxLogDebug ( _T("I detected %i display(s) on your system"), count ); - size_t i = 0; - while ( i < count ) - { - wxDisplay display ( i ); - wxRect r = display.GetGeometry(); - wxLogDebug ( _T("Display #%i \"%s\" = ( %i, %i, %i, %i ) @ %i bits"), - i, display.GetName().c_str(), r.GetLeft(), r.GetTop(), r.GetWidth(), r.GetHeight(), - display.GetCurrentMode().GetDepth() ); - i++; - } + size_t i = 0; + while ( i < count ) + { + wxDisplay display ( i ); + wxRect r = display.GetGeometry(); + wxLogDebug ( _T("Display #%i \"%s\" = ( %i, %i, %i, %i ) @ %i bits"), + i, display.GetName().c_str(), r.GetLeft(), r.GetTop(), r.GetWidth(), r.GetHeight(), + display.GetCurrentMode().GetDepth() ); + i++; + } } - #endif - return false; +#endif + return false; } diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index 9d1fe96853..bc77c7e8d7 100644 --- a/samples/oleauto/oleauto.cpp +++ b/samples/oleauto/oleauto.cpp @@ -30,7 +30,7 @@ #include "wx/wx.h" #endif -#include +#include "wx/msw/ole/automtn.h" #ifndef __WXMSW__ #error "Sorry, this sample works under Windows only." @@ -215,4 +215,3 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event)) return; } } - diff --git a/samples/opengl/penguin/dxfrenderer.cpp b/samples/opengl/penguin/dxfrenderer.cpp index 35481f884d..174fa05fc4 100644 --- a/samples/opengl/penguin/dxfrenderer.cpp +++ b/samples/opengl/penguin/dxfrenderer.cpp @@ -39,7 +39,7 @@ #include "dxfrenderer.h" -#include +#include "wx/listimpl.cpp" WX_DEFINE_LIST(DXFEntityList) WX_DEFINE_LIST(DXFLayerList) @@ -557,7 +557,7 @@ bool DXFRenderer::Load(wxInputStream& stream) return false; } else if (line2 == wxT("TABLES")) - { + { if (!ParseTables(stream)) return false; } diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 7694cee94a..e7a02de316 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -48,7 +48,7 @@ #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \ to 1 in setup.h and recompile the library. #else - #include + #include "wx/tbarsmpl.h" #endif #endif // USE_GENERIC_TBAR -- 2.47.2