From 8898456df4728afe7d100011e0e23b0ffb9a6341 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 18 Apr 2006 07:24:35 +0000 Subject: [PATCH] wx/wxprec.h already includes wx/defs.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/app.mm | 25 +++++++++---------- src/cocoa/bmpbuttn.mm | 7 +++--- src/cocoa/button.mm | 9 +++---- src/cocoa/control.mm | 9 +++---- src/cocoa/font.cpp | 50 ++++++++++++++++++++------------------ src/cocoa/tooltip.mm | 51 +++++++++++++++++++++------------------ src/common/archive.cpp | 9 +++---- src/common/filefn.cpp | 6 +++-- src/common/gifdecod.cpp | 11 ++++----- src/common/helpbase.cpp | 9 +++---- src/common/imagbmp.cpp | 13 +++++----- src/common/image.cpp | 9 ++++--- src/common/imagfill.cpp | 8 +++--- src/common/imaggif.cpp | 13 +++++----- src/common/imagiff.cpp | 13 +++++----- src/common/imagjpeg.cpp | 9 ++++--- src/common/imagpcx.cpp | 16 ++++++------ src/common/imagpng.cpp | 11 ++++----- src/common/imagtiff.cpp | 11 +++++---- src/common/imagxpm.cpp | 17 ++++++------- src/common/ipcbase.cpp | 6 ++--- src/common/layout.cpp | 26 +++++++++----------- src/common/list.cpp | 1 - src/common/matrix.cpp | 6 ++--- src/common/memory.cpp | 17 +++++-------- src/common/paper.cpp | 15 +++++------- src/common/prntbase.cpp | 30 +++++++++++------------ src/common/sckaddr.cpp | 5 ++-- src/common/sckfile.cpp | 10 +++----- src/common/sckstrm.cpp | 21 ++++++++-------- src/common/settcmn.cpp | 3 +-- src/common/stream.cpp | 9 +++---- src/common/string.cpp | 13 +++++----- src/common/taskbarcmn.cpp | 11 ++++++--- src/common/valgen.cpp | 36 ++++++++++++--------------- src/common/validate.cpp | 12 +++------ src/common/wincmn.cpp | 1 - src/common/wxchar.cpp | 21 ++++++++-------- src/common/xpmdecod.cpp | 13 +++++----- src/common/zipstrm.cpp | 11 ++++----- 40 files changed, 269 insertions(+), 304 deletions(-) diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index b2fd69ed50..18570e9c94 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/app.mm +// Name: src/cocoa/app.mm // Purpose: wxApp // Author: David Elliott // Modified by: @@ -10,8 +10,8 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/app.h" #include "wx/dc.h" #include "wx/intl.h" @@ -77,12 +77,12 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication); If nil is returned then idle event processing occurs until the user does not request anymore idle events or until a real event comes through. - RN: Even though Apple documentation states that nil can be passed in place + RN: Even though Apple documentation states that nil can be passed in place of [NSDate distantPast] in the untilDate parameter, this causes Jaguar (10.2) - to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we + to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we need to explicitly pass [NSDate distantPast] instead. */ - + - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag { // Get the same events except don't block @@ -233,7 +233,7 @@ wxApp::wxApp() m_topWindow = NULL; #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ argc = 0; @@ -263,7 +263,7 @@ bool wxApp::OnInitGui() { wxAutoNSAutoreleasePool pool; if(!wxAppBase::OnInitGui()) - return FALSE; + return false; // Create the app using the sharedApplication method m_cocoaApp = [NSApplication sharedApplication]; @@ -276,7 +276,7 @@ bool wxApp::OnInitGui() wxMenuBarManager::CreateInstance(); wxDC::CocoaInitializeTextSystem(); - return TRUE; + return true; } bool wxApp::CallOnInit() @@ -288,9 +288,9 @@ bool wxApp::CallOnInit() bool wxApp::OnInit() { if(!wxAppBase::OnInit()) - return FALSE; + return false; - return TRUE; + return true; } void wxApp::Exit() @@ -359,9 +359,8 @@ void wxApp::WakeUpIdle() #ifdef __WXDEBUG__ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ - diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm index 5081c6a5ac..ad28820435 100644 --- a/src/cocoa/bmpbuttn.mm +++ b/src/cocoa/bmpbuttn.mm @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/bmpbuttn.mm +// Name: src/cocoa/bmpbuttn.mm // Purpose: wxBitmapButton // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -14,7 +14,6 @@ #if wxUSE_BMPBUTTON #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/bmpbuttn.h" #include "wx/log.h" #endif diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm index a00ff71329..63ec84d602 100644 --- a/src/cocoa/button.mm +++ b/src/cocoa/button.mm @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/button.mm +// Name: src/cocoa/button.mm // Purpose: wxButton // Author: David Elliott // Modified by: // Created: 2002/12/30 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/button.h" #include "wx/log.h" #endif @@ -108,4 +108,3 @@ wxSize wxButtonBase::GetDefaultSize() // Apple HIG says OK/Cancel buttons have default width of 68. return wxSize(68,(int)ceil(cocoaRect.size.height)); } - diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm index 596f9cf4b0..858bcc626f 100644 --- a/src/cocoa/control.mm +++ b/src/cocoa/control.mm @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/control.mm +// Name: src/cocoa/control.mm // Purpose: wxControl class // Author: David Elliiott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/control.h" #include "wx/log.h" #endif @@ -123,4 +123,3 @@ void wxControl::CocoaSetEnabled(bool enable) { [GetNSControl() setEnabled: enable]; } - diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp index af1f3b552b..c8aa187d02 100644 --- a/src/cocoa/font.cpp +++ b/src/cocoa/font.cpp @@ -1,16 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/cocoa/font.cpp // Purpose: wxFont class // Author: AUTHOR // Modified by: // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/defs.h" -#include "wx/string.h" +#include "wx/wxprec.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" +#endif + #include "wx/font.h" #include "wx/gdicmn.h" #include "wx/encinfo.h" @@ -19,12 +23,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding) { - m_family = family; - m_style = style; - m_weight = weight; - m_underlined = underlined; - m_faceName = faceName; - m_encoding = encoding; + m_family = family; + m_style = style; + m_weight = weight; + m_underlined = underlined; + m_faceName = faceName; + m_encoding = encoding; } wxFontRefData::~wxFontRefData() @@ -34,7 +38,7 @@ wxFontRefData::~wxFontRefData() bool wxFont::Create(const wxNativeFontInfo&) { - return FALSE; + return false; } void wxFont::SetEncoding(wxFontEncoding) @@ -53,7 +57,7 @@ int wxFont::GetPointSize() const bool wxFont::GetUnderlined() const { - return FALSE; + return false; } int wxFont::GetStyle() const @@ -92,7 +96,7 @@ bool wxFont::Create(int pointSize, int family, int style, int weight, bool under RealizeResource(); - return TRUE; + return true; } wxFont::~wxFont() @@ -102,22 +106,22 @@ wxFont::~wxFont() bool wxFont::RealizeResource() { // TODO: create the font (if there is a native font object) - return FALSE; + return false; } void wxFont::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxFontRefData(); - } + m_refData = new wxFontRefData(); + } else { - wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxFont::SetPointSize(int pointSize) @@ -179,7 +183,7 @@ wxString wxFont::GetFaceName() const { wxString str; if (M_FONTDATA) - str = M_FONTDATA->m_faceName ; + str = M_FONTDATA->m_faceName ; return str; } diff --git a/src/cocoa/tooltip.mm b/src/cocoa/tooltip.mm index a1eeed486a..95008e474b 100644 --- a/src/cocoa/tooltip.mm +++ b/src/cocoa/tooltip.mm @@ -2,13 +2,15 @@ // Name: src/cocoa/tooltip.mm // Purpose: Cocoa tooltips // Author: Ryan Norton -// Modified by: +// Modified by: // Created: 2004-10-03 // RCS-ID: $Id$ // Copyright: (c) Ryan Norton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + // =========================================================================== // declarations // =========================================================================== @@ -17,11 +19,12 @@ // headers // --------------------------------------------------------------------------- -#include "wx/defs.h" - #if wxUSE_TOOLTIPS -#include "wx/window.h" +#ifndef WX_PRECOMP + #include "wx/window.h" +#endif + #include "wx/tooltip.h" #include "wx/cocoa/autorelease.h" @@ -30,7 +33,7 @@ #import // -// Private object in AppKit - exists in 10.2 at least - +// Private object in AppKit - exists in 10.2 at least - // most likely exists earlier too // @interface NSToolTipManager : NSObject @@ -88,34 +91,34 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) -wxToolTip::wxToolTip(const wxString &tip) : - m_text(tip), m_window(0) +wxToolTip::wxToolTip(const wxString &tip) : + m_text(tip), m_window(0) { } -wxToolTip::~wxToolTip() +wxToolTip::~wxToolTip() { } void wxToolTip::SetTip(const wxString& tip) -{ - m_text = tip; +{ + m_text = tip; } -const wxString& wxToolTip::GetTip() const -{ - return m_text; +const wxString& wxToolTip::GetTip() const +{ + return m_text; } // the window we're associated with -wxWindow *wxToolTip::GetWindow() const -{ - return m_window; +wxWindow *wxToolTip::GetWindow() const +{ + return m_window; } // enable or disable the tooltips globally -//static - void wxToolTip::Enable(bool flag) +//static + void wxToolTip::Enable(bool flag) { //TODO wxFAIL_MSG(wxT("Not implemented")); @@ -123,22 +126,22 @@ wxWindow *wxToolTip::GetWindow() const // set the delay after which the tooltip appears //static - void wxToolTip::SetDelay(long milliseconds) + void wxToolTip::SetDelay(long milliseconds) { [[NSToolTipManager sharedToolTipManager] setInitialToolTipDelay: ((double)milliseconds) / 1000.0]; } -void wxToolTip::SetWindow(wxWindow* window) +void wxToolTip::SetWindow(wxWindow* window) { wxAutoNSAutoreleasePool pool; m_window = window; - + //set the tooltip - empty string means remove - if (m_text.IsEmpty()) - [m_window->GetNSView() setToolTip:nil]; + if (m_text.empty()) + [m_window->GetNSView() setToolTip:nil]; else - [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)]; + [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)]; } #endif //wxUSE_TOOLTIPS diff --git a/src/common/archive.cpp b/src/common/archive.cpp index 757425b277..044498de11 100644 --- a/src/common/archive.cpp +++ b/src/common/archive.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: archive.cpp +// Name: src/common/archive.cpp // Purpose: Streams for archive formats // Author: Mike Wetherell // RCS-ID: $Id$ @@ -11,15 +11,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS + #ifndef WX_PRECOMP - #include "wx/defs.h" #endif -#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS - #include "wx/archive.h" #include "wx/link.h" diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 3d1fa6c33e..81f3e18eb1 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -19,14 +19,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" #ifdef __BORLANDC__ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" #include "wx/file.h" // This does include filefn.h #include "wx/filename.h" #include "wx/dir.h" diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 9421dbd5be..4b3e6ddc87 100644 --- a/src/common/gifdecod.cpp +++ b/src/common/gifdecod.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gifdecod.cpp +// Name: src/common/gifdecod.cpp // Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation // Author: Guillermo Rodriguez Garcia // Version: 3.04 @@ -12,16 +12,15 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS && wxUSE_GIF + #ifndef WX_PRECOMP -# include "wx/defs.h" -# include "wx/palette.h" + #include "wx/palette.h" #endif -#if wxUSE_STREAMS && wxUSE_GIF - #include #include #include "wx/gifdecod.h" diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp index 204a7d6dac..9083abd410 100644 --- a/src/common/helpbase.cpp +++ b/src/common/helpbase.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpbase.cpp +// Name: src/common/helpbase.cpp // Purpose: Help system base classes // Author: Julian Smart // Modified by: @@ -13,15 +13,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_HELP + #ifndef WX_PRECOMP -#include "wx/defs.h" #endif -#if wxUSE_HELP - #include "wx/helpbase.h" IMPLEMENT_CLASS(wxHelpControllerBase, wxObject) diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 5f9e5b072a..02d6d6ecca 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagbmp.cpp +// Name: src/common/imagbmp.cpp // Purpose: wxImage BMP,ICO and CUR handlers // Author: Robert Roebling, Chris Elliott // RCS-ID: $Id$ @@ -11,18 +11,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif + #include "wx/imagbmp.h" #include "wx/bitmap.h" #include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" diff --git a/src/common/image.cpp b/src/common/image.cpp index 9cac98dcbd..af8111c5c7 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -14,15 +14,16 @@ #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif + #include "wx/image.h" #include "wx/bitmap.h" #include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp index 9545f46ed4..89c1e5f784 100644 --- a/src/common/imagfill.cpp +++ b/src/common/imagfill.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagfill.cpp +// Name: src/common/imagfill.cpp // Purpose: FloodFill for wxImage // Author: Julian Smart // RCS-ID: $Id$ @@ -15,19 +15,17 @@ #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE && !defined(__WXMSW__) // we have no use for this code in wxMSW... -#include "wx/image.h" - #ifndef WX_PRECOMP #include "wx/brush.h" #include "wx/dc.h" #include "wx/dcmemory.h" #endif +#include "wx/image.h" + // DoFloodFill // Fills with the colour extracted from fillBrush, starting at x,y until either // a color different from the start pixel is reached (wxFLOOD_SURFACE) diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 19b164b1b2..69a0fbb094 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaggif.cpp +// Name: src/common/imaggif.cpp // Purpose: wxGIFHandler // Author: Vaclav Slavik & Guillermo Rodriguez Garcia // RCS-ID: $Id$ @@ -11,20 +11,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_GIF + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#if wxUSE_IMAGE && wxUSE_GIF - #include "wx/imaggif.h" #include "wx/gifdecod.h" #include "wx/wfstream.h" -#include "wx/log.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp index 626983fd50..311fcadfbb 100644 --- a/src/common/imagiff.cpp +++ b/src/common/imagiff.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagiff.h +// Name: src/common/imagiff.h // Purpose: wxImage handler for Amiga IFF images // Author: Steffen Gutmann, Thomas Meyer // RCS-ID: $Id$ @@ -16,19 +16,18 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_IFF + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/log.h" + #include "wx/intl.h" #endif -#if wxUSE_IMAGE && wxUSE_IFF - #include "wx/imagiff.h" #include "wx/wfstream.h" -#include "wx/log.h" -#include "wx/intl.h" #if wxUSE_PALETTE #include "wx/palette.h" diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 6a475f70bf..9892a3fcc2 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -14,15 +14,16 @@ #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE && wxUSE_LIBJPEG +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif + #include "wx/imagjpeg.h" #include "wx/bitmap.h" #include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" // NB: Some compilers define boolean type in Windows headers // (e.g. Watcom C++, but not Open Watcom). diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index 58eb0034c2..c8b42f3b0a 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagpcx.cpp +// Name: src/common/imagpcx.cpp // Purpose: wxImage PCX handler // Author: Guillermo Rodriguez Garcia // Version: 1.1 @@ -12,21 +12,20 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_PCX + #ifndef WX_PRECOMP -# include "wx/defs.h" -# include "wx/palette.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/palette.h" #endif -#if wxUSE_IMAGE && wxUSE_PCX - #include "wx/imagpcx.h" #include "wx/wfstream.h" #include "wx/module.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/hash.h" #include "wx/list.h" @@ -500,4 +499,3 @@ bool wxPCXHandler::DoCanRead( wxInputStream& stream ) #endif // wxUSE_STREAMS #endif // wxUSE_IMAGE && wxUSE_PCX - diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 1d8a97046d..5a5b25e584 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -19,20 +19,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_LIBPNG + #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/log.h" + #include "wx/app.h" #endif -#if wxUSE_IMAGE && wxUSE_LIBPNG - #include "wx/imagpng.h" #include "wx/bitmap.h" #include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" #include "png.h" #include "wx/filefn.h" #include "wx/wfstream.h" diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 08174ddd8e..ed0ec204b7 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -11,18 +11,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_IMAGE && wxUSE_LIBTIFF +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif + #include "wx/imagtiff.h" #include "wx/bitmap.h" #include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" extern "C" { #include "tiff.h" diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index aa511c7359..843eddf654 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagxpm.cpp +// Name: src/common/imagxpm.cpp // Purpose: wxXPMHandler // Author: Vaclav Slavik, Robert Roebling // RCS-ID: $Id$ @@ -66,19 +66,18 @@ license is as follows: #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_XPM + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/log.h" + #include "wx/intl.h" #endif -#if wxUSE_XPM - #include "wx/imagxpm.h" #include "wx/wfstream.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/utils.h" #include "wx/xpmdecod.h" @@ -145,7 +144,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, sName << wxT("_xpm"); } - if ( !sName.IsEmpty() ) + if ( !sName.empty() ) sName = wxString(wxT("/* XPM */\nstatic char *")) + sName; else sName = wxT("/* XPM */\nstatic char *xpm_data"); @@ -211,7 +210,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, } tmp = wxT("/* pixels */\n"); - stream.Write( (const char*) tmp.ToAscii(), tmp.Length() ); + stream.Write( (const char*) tmp.ToAscii(), tmp.length() ); unsigned char *data = image->GetData(); for (j = 0; j < image->GetHeight(); j++) diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp index 31f3cab4bd..151b3004d1 100644 --- a/src/common/ipcbase.cpp +++ b/src/common/ipcbase.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: ipcbase.cpp +// Name: src/common/ipcbase.cpp // Purpose: IPC base classes // Author: Julian Smart // Modified by: @@ -13,11 +13,10 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" #endif #include "wx/ipcbase.h" @@ -87,4 +86,3 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes ) return NULL; } } - diff --git a/src/common/layout.cpp b/src/common/layout.cpp index 5fbe0e19f6..d49aaea5b2 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: layout.cpp +// Name: src/common/layout.cpp // Purpose: Constraint layout system classes // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================= @@ -21,28 +21,24 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_CONSTRAINTS #ifndef WX_PRECOMP - #include "wx/window.h" - #include "wx/utils.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" + #include "wx/window.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/intl.h" #endif #include "wx/layout.h" - IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) inline void wxGetAsIs(wxWindowBase* win, int* w, int* h) @@ -51,7 +47,7 @@ inline void wxGetAsIs(wxWindowBase* win, int* w, int* h) // The old way. Works for me. win->GetSize(w, h); #endif - + #if 0 // Vadim's change. Breaks wxPython's LayoutAnchors win->GetBestSize(w, h); diff --git a/src/common/list.cpp b/src/common/list.cpp index e25a2ad720..3d8a0ef389 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -29,7 +29,6 @@ #include #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/list.h" #endif diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp index 724b7a5827..769dd965e1 100644 --- a/src/common/matrix.cpp +++ b/src/common/matrix.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: matrix.cpp +// Name: src/common/matrix.cpp // Purpose: wxTransformMatrix class // Author: Chris Breeze, Julian Smart // Modified by: Klaas Holwerda @@ -20,8 +20,7 @@ #endif #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/math.h" + #include "wx/math.h" #endif #include "wx/matrix.h" @@ -600,4 +599,3 @@ void wxTransformMatrix::SetRotation(double rotation) Rotate(-GetRotation(), x, y); Rotate(rotation, x, y); } - diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 1a6fae329d..7c062d71a7 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: memory.cpp +// Name: src/common/memory.cpp // Purpose: Memory checking implementation // Author: Arthur Seaton, Julian Smart // Modified by: @@ -13,23 +13,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/defs.h" + #pragma hdrstop #endif #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/hash.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/hash.h" #endif #if wxUSE_THREADS -#include "wx/thread.h" + #include "wx/thread.h" #endif #include "wx/log.h" @@ -1160,4 +1156,3 @@ void wxDebugContextDumpDelayCounter::DoDump() static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One; #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - diff --git a/src/common/paper.cpp b/src/common/paper.cpp index c307f80fa6..7f1cbfa40b 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: paper.cpp +// Name: src/common/paper.cpp // Purpose: Paper size classes // Author: Julian Smart // Modified by: @@ -13,18 +13,16 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_PRINTING_ARCHITECTURE #ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/settings.h" -#include "wx/intl.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/intl.h" #endif #include "wx/paper.h" @@ -162,7 +160,7 @@ void wxPrintPaperDatabase::CreateDatabase() WXADDPAPER(wxPAPER_A2, DMPAPER_A2, wxTRANSLATE("A2 420 x 594 mm"), 4200, 5940); WXADDPAPER(wxPAPER_A3_TRANSVERSE, DMPAPER_A3_TRANSVERSE, wxTRANSLATE("A3 Transverse 297 x 420 mm"), 2970, 4200); WXADDPAPER(wxPAPER_A3_EXTRA_TRANSVERSE,DMPAPER_A3_EXTRA_TRANSVERSE,wxTRANSLATE("A3 Extra Transverse 322 x 445 mm"), 3220, 4450); - + WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD, 69, wxTRANSLATE("Japanese Double Postcard 200 x 148 mm"), 2000, 1480); WXADDPAPER(wxPAPER_A6, 70, wxTRANSLATE("A6 105 x 148 mm"), 1050, 1480); WXADDPAPER(wxPAPER_JENV_KAKU2, 71, wxTRANSLATE("Japanese Envelope Kaku #2"), 2400, 3320); @@ -372,4 +370,3 @@ void wxPrintPaperModule::OnExit() } #endif // wxUSE_PRINTING_ARCHITECTURE - diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 7b910540b2..3b977cc779 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -13,27 +13,25 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #if wxUSE_PRINTING_ARCHITECTURE #ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/dc.h" -#include "wx/app.h" -#include "wx/msgdlg.h" -#include "wx/layout.h" -#include "wx/choice.h" -#include "wx/button.h" -#include "wx/settings.h" -#include "wx/dcmemory.h" -#include "wx/stattext.h" -#include "wx/intl.h" -#include "wx/textdlg.h" -#include "wx/sizer.h" + #include "wx/utils.h" + #include "wx/dc.h" + #include "wx/app.h" + #include "wx/msgdlg.h" + #include "wx/layout.h" + #include "wx/choice.h" + #include "wx/button.h" + #include "wx/settings.h" + #include "wx/dcmemory.h" + #include "wx/stattext.h" + #include "wx/intl.h" + #include "wx/textdlg.h" + #include "wx/sizer.h" #endif // !WX_PRECOMP #include "wx/prntbase.h" diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index b8a96b2f5f..a3b1c1767f 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckaddr.cpp +// Name: src/common/sckaddr.cpp // Purpose: Network address manager // Author: Guilhem Lavaux // Modified by: @@ -13,13 +13,12 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/object.h" #include "wx/log.h" #include "wx/intl.h" diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index ba55e1ce96..adf5a85c90 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckfile.cpp +// Name: src/common/sckfile.cpp // Purpose: File protocol // Author: Guilhem Lavaux // Modified by: @@ -13,15 +13,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE + #ifndef WX_PRECOMP - #include "wx/defs.h" #endif -#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE - #include #include "wx/wfstream.h" #include "wx/protocol/file.h" @@ -56,4 +55,3 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path) } #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE - diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp index 54d72931c8..56ce74de65 100644 --- a/src/common/sckstrm.cpp +++ b/src/common/sckstrm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckstrm.h +// Name: src/common/sckstrm.cpp // Purpose: wxSocket*Stream // Author: Guilhem Lavaux // Modified by: @@ -13,15 +13,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_SOCKETS && wxUSE_STREAMS + #ifndef WX_PRECOMP - #include "wx/defs.h" #endif -#if wxUSE_SOCKETS && wxUSE_STREAMS - #include "wx/stream.h" #include "wx/socket.h" #include "wx/sckstrm.h" @@ -41,11 +40,11 @@ wxSocketOutputStream::~wxSocketOutputStream() size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size) { - size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount(); + size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount(); - m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; + m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; - return ret; + return ret; } // --------------------------------------------------------------------------- @@ -63,11 +62,11 @@ wxSocketInputStream::~wxSocketInputStream() size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size) { - size_t ret = m_i_socket->Read((char *)buffer, size).LastCount(); + size_t ret = m_i_socket->Read((char *)buffer, size).LastCount(); - m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR; + m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR; - return ret; + return ret; } // --------------------------------------------------------------------------- diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp index 90cacfeb9d..77e7e67f53 100644 --- a/src/common/settcmn.cpp +++ b/src/common/settcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/settcmn.cpp +// Name: src/common/settcmn.cpp // Purpose: common (to all ports) wxWindow functions // Author: Robert Roebling // RCS-ID: $Id$ @@ -23,7 +23,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/utils.h" #include "wx/settings.h" #endif //WX_PRECOMP diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 73dde47896..9d1bb67a26 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -22,20 +22,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS + #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/log.h" #endif -#if wxUSE_STREAMS - #include #include "wx/stream.h" #include "wx/datstrm.h" #include "wx/textfile.h" -#include "wx/log.h" // ---------------------------------------------------------------------------- // constants diff --git a/src/common/string.cpp b/src/common/string.cpp index aa039f976b..b4735f8d07 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: string.cpp +// Name: src/common/string.cpp // Purpose: wxString class // Author: Vadim Zeitlin, Ryan Norton // Modified by: @@ -25,14 +25,13 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/defs.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/thread.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/thread.h" #endif #include @@ -40,7 +39,7 @@ #include #ifdef __SALFORDC__ - #include + #include #endif // allocating extra space for each string consumes more memory but speeds up diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp index b08d6cf20d..1ffc0a1db1 100644 --- a/src/common/taskbarcmn.cpp +++ b/src/common/taskbarcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbarcmn.cpp +// File: src/common/taskbarcmn.cpp // Purpose: Common parts of wxTaskBarIcon class // Author: Julian Smart // Modified by: @@ -12,12 +12,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif #ifdef wxHAS_TASK_BAR_ICON +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif + // DLL options compatibility check: -#include "wx/app.h" WX_CHECK_BUILD_OPTIONS("wxAdvanced") diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index ff8d3faf6f..46c0a4cbb7 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -13,31 +13,27 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_VALIDATORS #ifndef WX_PRECOMP - #include "wx/utils.h" - #include "wx/intl.h" - #include "wx/dynarray.h" - #include "wx/choice.h" - #include "wx/combobox.h" - #include "wx/radiobox.h" - #include "wx/radiobut.h" - #include "wx/checkbox.h" - #include "wx/scrolbar.h" - #include "wx/gauge.h" - #include "wx/stattext.h" - #include "wx/textctrl.h" - #include "wx/button.h" - #include "wx/listbox.h" - #include "wx/slider.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/dynarray.h" + #include "wx/choice.h" + #include "wx/combobox.h" + #include "wx/radiobox.h" + #include "wx/radiobut.h" + #include "wx/checkbox.h" + #include "wx/scrolbar.h" + #include "wx/gauge.h" + #include "wx/stattext.h" + #include "wx/textctrl.h" + #include "wx/button.h" + #include "wx/listbox.h" + #include "wx/slider.h" #endif #include "wx/spinctrl.h" diff --git a/src/common/validate.cpp b/src/common/validate.cpp index 39d225707d..b41574d65c 100644 --- a/src/common/validate.cpp +++ b/src/common/validate.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: validate.cpp +// Name: src/common/validate.cpp // Purpose: wxValidator // Author: Julian Smart // Modified by: @@ -13,24 +13,20 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_VALIDATORS #ifndef WX_PRECOMP - #include "wx/window.h" + #include "wx/window.h" #endif #include "wx/validate.h" const wxValidator wxDefaultValidator; - IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler) +IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler) // VZ: personally, I think true would be more appropriate - these bells are // _annoying_ diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index a18e65850a..6b903252e1 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -29,7 +29,6 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/frame.h" - #include "wx/defs.h" #include "wx/window.h" #include "wx/control.h" #include "wx/checkbox.h" diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index d70f0f5350..0f8e76ccbb 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -17,7 +17,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #define _ISOC9X_SOURCE 1 // to get vsscanf() @@ -28,24 +28,23 @@ #include #ifndef __WXWINCE__ -#include -#include + #include + #include #else -#include "wx/msw/wince/time.h" + #include "wx/msw/wince/time.h" #endif #ifndef WX_PRECOMP - #include "wx/defs.h" - #include "wx/wxchar.h" - #include "wx/string.h" - #include "wx/hash.h" + #include "wx/wxchar.h" + #include "wx/string.h" + #include "wx/hash.h" #endif #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H) #include - #include - #include - #include + #include + #include + #include #endif #if defined(__MWERKS__) && __MSL__ >= 0x6000 diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 12612d62ba..6fd4fb11aa 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xpmdecod.cpp +// Name: src/common/xpmdecod.cpp // Purpose: wxXPMDecoder // Author: John Cristy, Vaclav Slavik // RCS-ID: $Id$ @@ -94,21 +94,20 @@ license is as follows: #include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_XPM + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#if wxUSE_IMAGE && wxUSE_XPM - #include "wx/stream.h" #include "wx/image.h" #include "wx/utils.h" -#include "wx/log.h" #include "wx/hashmap.h" -#include "wx/intl.h" #include #include diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 981d506d20..78a4471910 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -11,18 +11,17 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM + #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM - #include "wx/zipstrm.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/datstrm.h" #include "wx/zstream.h" #include "wx/mstream.h" -- 2.47.2