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

@@ -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__
-

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

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));
 }
-

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];
 }
-

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/wxprec.h"
-#include "wx/string.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_family = family;
-	m_style = style;
+    m_style = style;
-	m_weight = weight;
+    m_weight = weight;
-	m_underlined = underlined;
+    m_underlined = underlined;
-	m_faceName = faceName;
+    m_faceName = faceName;
-	m_encoding = encoding;
+    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
+    // Don't change shared data
-	if (!m_refData)
+    if (!m_refData)
     {
-		m_refData = new wxFontRefData();
+        m_refData = new wxFontRefData();
-	}
+    }
     else
     {
-		wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-		UnRef();
+        UnRef();
-		m_refData = ref;
+        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;
 }
 

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 <AppKit/NSView.h>
 
 //
-// 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) : 
+wxToolTip::wxToolTip(const wxString &tip) :
-    m_text(tip), m_window(0) 
+    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 
+const wxString& wxToolTip::GetTip() const
-{ 
+{
-    return m_text; 
+    return m_text;
 }
 
 // the window we're associated with
-wxWindow *wxToolTip::GetWindow() const 
+wxWindow *wxToolTip::GetWindow() const
-{ 
+{
-    return m_window; 
+    return m_window;
 }
 
 // enable or disable the tooltips globally
-//static 
+//static
-    void wxToolTip::Enable(bool flag) 
+    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())
+    if (m_text.empty())
-        [m_window->GetNSView() setToolTip:nil];        
+        [m_window->GetNSView() setToolTip:nil];
     else
-        [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)];    
+        [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)];
 }
 
 #endif //wxUSE_TOOLTIPS

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
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/archive.h"
 #include "wx/link.h"
 

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"

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 <guille@iies.es>
 // Version:     3.04
@@ -12,16 +12,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#  pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
-#  include "wx/palette.h"
 #endif
 
 #if wxUSE_STREAMS && wxUSE_GIF
 
+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "wx/gifdecod.h"

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
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #if wxUSE_HELP
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/helpbase.h"
 
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)

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"

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"

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)

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
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_GIF
 
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
 #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)
 

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
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_IFF
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif
+
 #include "wx/imagiff.h"
 #include "wx/wfstream.h"
-#include "wx/log.h"
-#include "wx/intl.h"
 
 #if wxUSE_PALETTE
     #include "wx/palette.h"

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).

src/common/imagpcx.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagpcx.cpp
+// Name:        src/common/imagpcx.cpp
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     1.1
@@ -12,21 +12,20 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
-#  include "wx/palette.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PCX
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/palette.h"
+#endif
+
 #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
-

src/common/imagpng.cpp

@@ -19,20 +19,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_LIBPNG
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+
 #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"

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"

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
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
 #endif
 
 #if wxUSE_XPM
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif
+
 #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++)

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;
   }
 }
-

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
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_CONSTRAINTS
 
 #ifndef WX_PRECOMP
-  #include "wx/window.h"
+    #include "wx/window.h"
-  #include "wx/utils.h"
+    #include "wx/utils.h"
-  #include "wx/dialog.h"
+    #include "wx/dialog.h"
-  #include "wx/msgdlg.h"
+    #include "wx/msgdlg.h"
-  #include "wx/intl.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);

src/common/list.cpp

@@ -29,7 +29,6 @@
 #include <string.h>
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
 #endif
 

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);
 }
-

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
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
+    #include "wx/utils.h"
-#include "wx/app.h"
+    #include "wx/app.h"
-#include "wx/hash.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
-

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/utils.h"
-#include "wx/settings.h"
+    #include "wx/settings.h"
-#include "wx/intl.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
-

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/utils.h"
-#include "wx/dc.h"
+    #include "wx/dc.h"
-#include "wx/app.h"
+    #include "wx/app.h"
-#include "wx/msgdlg.h"
+    #include "wx/msgdlg.h"
-#include "wx/layout.h"
+    #include "wx/layout.h"
-#include "wx/choice.h"
+    #include "wx/choice.h"
-#include "wx/button.h"
+    #include "wx/button.h"
-#include "wx/settings.h"
+    #include "wx/settings.h"
-#include "wx/dcmemory.h"
+    #include "wx/dcmemory.h"
-#include "wx/stattext.h"
+    #include "wx/stattext.h"
-#include "wx/intl.h"
+    #include "wx/intl.h"
-#include "wx/textdlg.h"
+    #include "wx/textdlg.h"
-#include "wx/sizer.h"
+    #include "wx/sizer.h"
 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"

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"

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
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
 
+#ifndef WX_PRECOMP
+#endif
+
 #include <stdio.h>
 #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
-

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
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_SOCKETS && wxUSE_STREAMS
 
+#ifndef WX_PRECOMP
+#endif
+
 #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;
 }
 
 // ---------------------------------------------------------------------------

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

src/common/stream.cpp

@@ -22,20 +22,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_STREAMS
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
 #include <ctype.h>
 #include "wx/stream.h"
 #include "wx/datstrm.h"
 #include "wx/textfile.h"
-#include "wx/log.h"
 
 // ----------------------------------------------------------------------------
 // constants

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/string.h"
+    #include "wx/intl.h"
-  #include "wx/intl.h"
+    #include "wx/thread.h"
-  #include "wx/thread.h"
 #endif
 
 #include <ctype.h>
@@ -40,7 +39,7 @@
 #include <stdlib.h>
 
 #ifdef __SALFORDC__
-  #include <clib.h>
+    #include <clib.h>
 #endif
 
 // allocating extra space for each string consumes more memory but speeds up

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")
 
 

src/common/valgen.cpp

@@ -13,31 +13,27 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
-  #include "wx/utils.h"
+    #include "wx/utils.h"
-  #include "wx/intl.h"
+    #include "wx/intl.h"
-  #include "wx/dynarray.h"
+    #include "wx/dynarray.h"
-  #include "wx/choice.h"
+    #include "wx/choice.h"
-  #include "wx/combobox.h"
+    #include "wx/combobox.h"
-  #include "wx/radiobox.h"
+    #include "wx/radiobox.h"
-  #include "wx/radiobut.h"
+    #include "wx/radiobut.h"
-  #include "wx/checkbox.h"
+    #include "wx/checkbox.h"
-  #include "wx/scrolbar.h"
+    #include "wx/scrolbar.h"
-  #include "wx/gauge.h"
+    #include "wx/gauge.h"
-  #include "wx/stattext.h"
+    #include "wx/stattext.h"
-  #include "wx/textctrl.h"
+    #include "wx/textctrl.h"
-  #include "wx/button.h"
+    #include "wx/button.h"
-  #include "wx/listbox.h"
+    #include "wx/listbox.h"
-  #include "wx/slider.h"
+    #include "wx/slider.h"
 #endif
 
 #include "wx/spinctrl.h"

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
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #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_

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"

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 <string.h>
 
 #ifndef __WXWINCE__
-#include <time.h>
+    #include <time.h>
-#include <locale.h>
+    #include <locale.h>
 #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/wxchar.h"
+    #include "wx/string.h"
-  #include "wx/string.h"
+    #include "wx/hash.h"
-  #include "wx/hash.h"
 #endif
 
 #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
   #include <windef.h>
-  #include <winbase.h>
+    #include <winbase.h>
-  #include <winnls.h>
+    #include <winnls.h>
-  #include <winnt.h>
+    #include <winnt.h>
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000

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
-
-#ifndef WX_PRECOMP
-#  include "wx/defs.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_XPM
 
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
 #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 <string.h>
 
 #include <ctype.h>

src/common/zipstrm.cpp

@@ -11,18 +11,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
 #if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
 
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
 #include "wx/zipstrm.h"
-#include "wx/log.h"
-#include "wx/intl.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"