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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index b2fd69ed5093f882481429aac15b0d5d82cdc410..18570e9c94fb32258c37f4fd343a8ca4b8441d77 100644 (file)
--- 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:
 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:


@@ -10,8 +10,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/intl.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.
 
     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)
     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.
 */
     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
 - (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_topWindow = NULL;
 
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     argc = 0;
 #endif // __WXDEBUG__
 
     argc = 0;


@@ -263,7 +263,7 @@ bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())

-        return FALSE;
+        return false;

 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];


@@ -276,7 +276,7 @@ bool wxApp::OnInitGui()
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();

-    return TRUE;
+    return true;

 }
 
 bool wxApp::CallOnInit()
 }
 
 bool wxApp::CallOnInit()


@@ -288,9 +288,9 @@ bool wxApp::CallOnInit()
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxApp::Exit()
 }
 
 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)
 {
 #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);
     wxAppBase::OnAssert(file, line, cond, msg);

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 #endif // __WXDEBUG__
 }
 #endif // __WXDEBUG__

-

diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm
index 5081c6a5ac1bb730a93b14bdcea4f36f92ee204c..ad28820435ca5ea350749824166e4eba31c4b9bb 100644 (file)
--- 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
 // Purpose:     wxBitmapButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -14,7 +14,6 @@
 #if wxUSE_BMPBUTTON
 
 #ifndef WX_PRECOMP
 #if wxUSE_BMPBUTTON
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
 #endif
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
 #endif

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index a00ff71329d1f3302496a014d99f4159edb01e03..63ec84d6023c70a8781cfa13f8989fe2c56b32de 100644 (file)
--- 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
 // Purpose:     wxButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/button.h"
     #include "wx/log.h"
 #endif
     #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));
 }
     // 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 596f9cf4b0189fb68e57b3dc8d9f56c1bb232fe3..858bcc626f0ec3f7cdf24b6fd0560516162a0822 100644 (file)
--- 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
 // Purpose:     wxControl class
 // Author:      David Elliiott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/control.h"
     #include "wx/log.h"
 #endif
     #include "wx/control.h"
     #include "wx/log.h"
 #endif


@@ -123,4 +123,3 @@ void wxControl::CocoaSetEnabled(bool enable)
 {
     [GetNSControl() setEnabled: enable];
 }
 {
     [GetNSControl() setEnabled: enable];
 }

-

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index af1f3b552b05fb01c32030a6590363f4568011c7..c8aa187d02a88996eb5cdb92c69984a81e4cf29f 100644 (file)
--- 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
 // 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"
 #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)
 {
 
 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()
 }
 
 wxFontRefData::~wxFontRefData()


@@ -34,7 +38,7 @@ wxFontRefData::~wxFontRefData()
 
 bool wxFont::Create(const wxNativeFontInfo&)
 {
 
 bool wxFont::Create(const wxNativeFontInfo&)
 {

-    return FALSE;
+    return false;

 }
 
 void wxFont::SetEncoding(wxFontEncoding)
 }
 
 void wxFont::SetEncoding(wxFontEncoding)


@@ -53,7 +57,7 @@ int wxFont::GetPointSize() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    return FALSE;
+    return false;

 }
 
 int wxFont::GetStyle() const
 }
 
 int wxFont::GetStyle() const


@@ -92,7 +96,7 @@ bool wxFont::Create(int pointSize, int family, int style, int weight, bool under
 
     RealizeResource();
 
 
     RealizeResource();
 

-    return TRUE;
+    return true;

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()


@@ -102,22 +106,22 @@ wxFont::~wxFont()
 bool wxFont::RealizeResource()
 {
     // TODO: create the font (if there is a native font object)
 bool wxFont::RealizeResource()
 {
     // TODO: create the font (if there is a native font object)

-    return FALSE;
+    return false;

 }
 
 void wxFont::Unshare()
 {
 }
 
 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
     {
     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)
 }
 
 void wxFont::SetPointSize(int pointSize)


@@ -179,7 +183,7 @@ wxString wxFont::GetFaceName() const
 {
     wxString str;
     if (M_FONTDATA)
 {
     wxString str;
     if (M_FONTDATA)

-           str = M_FONTDATA->m_faceName ;
+        str = M_FONTDATA->m_faceName ;

     return str;
 }
 
     return str;
 }
 

diff --git a/src/cocoa/tooltip.mm b/src/cocoa/tooltip.mm
index a1eeed486aa98e23c206fda9b720b9a71cb12609..95008e474bcb046bed1203ce9875ca1ed277d6f2 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     2004-10-03
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+

 // ===========================================================================
 // declarations
 // ===========================================================================
 // ===========================================================================
 // declarations
 // ===========================================================================


@@ -17,11 +19,12 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#include "wx/defs.h"
-

 #if wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS
 

-#include "wx/window.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+

 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"


@@ -30,7 +33,7 @@
 #import <AppKit/NSView.h>
 
 //
 #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
 // most likely exists earlier too
 //
 @interface NSToolTipManager : NSObject


@@ -88,34 +91,34 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 
 
 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)
 {
 }
 
 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
 }
 
 // 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
 }
 
 // enable or disable the tooltips globally

-//static 
-    void wxToolTip::Enable(bool flag) 
+//static
+    void wxToolTip::Enable(bool flag)

 {
     //TODO
     wxFAIL_MSG(wxT("Not implemented"));
 {
     //TODO
     wxFAIL_MSG(wxT("Not implemented"));


@@ -123,22 +126,22 @@ wxWindow *wxToolTip::GetWindow() const
 
 // set the delay after which the tooltip appears
 //static
 
 // 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];
 }
 
 {
     [[NSToolTipManager sharedToolTipManager] setInitialToolTipDelay: ((double)milliseconds) / 1000.0];
 }
 

-void wxToolTip::SetWindow(wxWindow* window) 
+void wxToolTip::SetWindow(wxWindow* window)

 {
     wxAutoNSAutoreleasePool pool;
 
     m_window = window;
 {
     wxAutoNSAutoreleasePool pool;
 
     m_window = window;

-    
+

     //set the tooltip - empty string means remove
     //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
     else

-        [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)];    
+        [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)];

 }
 
 #endif //wxUSE_TOOLTIPS
 }
 
 #endif //wxUSE_TOOLTIPS

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 757425b2777ed57393c6e07d56f23cc12047c0f9..044498de116ed186d141933c8a569ff683248d95 100644 (file)
--- 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$
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$


@@ -11,15 +11,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"

 #endif
 
 #endif
 

-#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
-

 #include "wx/archive.h"
 #include "wx/link.h"
 
 #include "wx/archive.h"
 #include "wx/link.h"
 

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 3d1fa6c33e9b76c02adae72a4711ee49c9e61a73..81f3e18eb1741e7eedd3b50f33feb8acbe811acb 100644 (file)
--- 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/defs.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+#endif
+

 #include "wx/utils.h"
 #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"
 #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 9421dbd5be7828e32fd88c4cd15322c12dbcd447..4b3e6ddc87660a5747cff14f5c4e03d3fc38e6b3 100644 (file)
--- 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 <guille@iies.es>
 // Version:     3.04
 // 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__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_GIF
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
-#  include "wx/palette.h"
+    #include "wx/palette.h"

 #endif
 
 #endif
 

-#if wxUSE_STREAMS && wxUSE_GIF
-

 #include <stdlib.h>
 #include <string.h>
 #include "wx/gifdecod.h"
 #include <stdlib.h>
 #include <string.h>
 #include "wx/gifdecod.h"

diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp
index 204a7d6dac85bbcf164b188d1c5d1b53418eb593..9083abd41042ba13e36ec4bccc97a9151f80d9f0 100644 (file)
--- 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:
 // Purpose:     Help system base classes
 // Author:      Julian Smart
 // Modified by:


@@ -13,15 +13,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HELP
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"

 #endif
 
 #endif
 

-#if wxUSE_HELP
-

 #include "wx/helpbase.h"
 
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
 #include "wx/helpbase.h"
 
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 5f9e5b072a0fda15765cf50c3c881f274b0ead32..02d6d6ecca3dc011a407c70613b270d12b408af0 100644 (file)
--- 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$
 // 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__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE
 
 #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/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"
 #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 9cac98dcbdd9c020231704bbfba3460631d98500..af8111c5c7d7ec4c78ad4062118cd86b01370ced 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -14,15 +14,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE
 
 #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/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"
 #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 9545f46ed4cee3ec0310c97923dd31e7e79c81c6..89c1e5f7845985856b7411fb641f91e4b698250f 100644 (file)
--- 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$
 // Purpose:     FloodFill for wxImage
 // Author:      Julian Smart
 // RCS-ID:      $Id$


@@ -15,19 +15,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE && !defined(__WXMSW__)
 // we have no use for this code in wxMSW...
 
 #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
 
 #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)
 // 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 19b164b1b20720e10213715b32c10b7994252901..69a0fbb09479c0415189da12f06cb3ab1e9f861f 100644 (file)
--- 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$
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$


@@ -11,20 +11,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_GIF
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_GIF
-

 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 

diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index 626983fd50bc1257ecff2be8fd5085e406a260ee..311fcadfbb6e402d4b9a743029a19e462426551b 100644 (file)
--- 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$
 // 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__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_IFF
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_IFF
-

 #include "wx/imagiff.h"
 #include "wx/wfstream.h"
 #include "wx/imagiff.h"
 #include "wx/wfstream.h"

-#include "wx/log.h"
-#include "wx/intl.h"

 
 #if wxUSE_PALETTE
     #include "wx/palette.h"
 
 #if wxUSE_PALETTE
     #include "wx/palette.h"

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 6a475f70bf757953468346b60788f445d68af7b9..9892a3fcc2d7cbb2c5b4550a6548e5d1ab0b0eae 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -14,15 +14,16 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE && wxUSE_LIBJPEG
 
 #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/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).
 
 // 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 58eb0034c23a9e1efa5972abec42ece8ad6b93b0..c8b42f3b0a46acc6d7c1279305bd40cf717ece13 100644 (file)
--- 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 <guille@iies.es>
 // Version:     1.1
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     1.1


@@ -12,21 +12,20 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_PCX
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
-#  include "wx/palette.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/palette.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_PCX
-

 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #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"
 
 #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
 #endif // wxUSE_STREAMS
 
 #endif // wxUSE_IMAGE && wxUSE_PCX

-

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 1d8a97046dba72fdef5297b72371ece92662ca70..5a5b25e584172451724ba5dc4cdd9797109ab794 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -19,20 +19,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_LIBPNG
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_LIBPNG
-

 #include "wx/imagpng.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #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"
 #include "png.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 08174ddd8eef58f7f48683071ba381b9885288f2..ed0ec204b77f790f5a92935e3d103818adfd1aa5 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -11,18 +11,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE && wxUSE_LIBTIFF
 
 #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/imagtiff.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"

-#include "wx/log.h"
-#include "wx/app.h"

 extern "C"
 {
     #include "tiff.h"
 extern "C"
 {
     #include "tiff.h"

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index aa511c7359ade11b6e2024af64c8f95c149753e7..843eddf654362673102bbdfb2923e2843bb94737 100644 (file)
--- 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$
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$


@@ -66,19 +66,18 @@ license is as follows:
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_XPM
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"

 #endif
 
 #endif
 

-#if wxUSE_XPM
-

 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"

-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/utils.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/utils.h"
 #include "wx/xpmdecod.h"
 


@@ -145,7 +144,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         sName << wxT("_xpm");
     }
 
         sName << wxT("_xpm");
     }
 

-    if ( !sName.IsEmpty() )
+    if ( !sName.empty() )

         sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
     else
         sName = wxT("/* XPM */\nstatic char *xpm_data");
         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");
     }
 
     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++)
 
     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 31f3cab4bd8ddbb445c7d3c7b64ea9ab7ad53577..151b3004d1a3b4e6c48ef59a66f06a1d62eafbd1 100644 (file)
--- 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:
 // Purpose:     IPC base classes
 // Author:      Julian Smart
 // Modified by:


@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"

 #endif
 
 #include "wx/ipcbase.h"
 #endif
 
 #include "wx/ipcbase.h"


@@ -87,4 +86,3 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
       return NULL;
   }
 }
       return NULL;
   }
 }

-

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 5fbe0e19f6fb7901a1474273eae1d55143b58b11..d49aaea5b2786d061e7979430ff72deed595df55 100644 (file)
--- 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
 // 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__
 #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
 #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"
 
 #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)
 
 
 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
     // The old way.  Works for me.
     win->GetSize(w, h);
 #endif

-    
+

 #if 0
     // Vadim's change.  Breaks wxPython's LayoutAnchors
     win->GetBestSize(w, h);
 #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 e25a2ad720e02e86fa93fc75622b79dd5cd6b11d..3d8a0ef389f96c8012ba9cab7ae39f1ee5a9eeac 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #ifndef WX_PRECOMP
 #include <string.h>
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/list.h"
 #endif
 
     #include "wx/list.h"
 #endif
 

diff --git a/src/common/matrix.cpp b/src/common/matrix.cpp
index 724b7a5827ca2c68669a66b80e5b20881451e199..769dd965e1e105e672b9f997c9fcc24c6e034bbf 100644 (file)
--- 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
 // Purpose:     wxTransformMatrix class
 // Author:      Chris Breeze, Julian Smart
 // Modified by: Klaas Holwerda


@@ -20,8 +20,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
-#include "wx/math.h"
+    #include "wx/math.h"

 #endif
 
 #include "wx/matrix.h"
 #endif
 
 #include "wx/matrix.h"


@@ -600,4 +599,3 @@ void wxTransformMatrix::SetRotation(double rotation)
     Rotate(-GetRotation(), x, y);
     Rotate(rotation, x, y);
 }
     Rotate(-GetRotation(), x, y);
     Rotate(rotation, x, y);
 }

-

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 1a6fae329d6a5d0bf93258139d55457b2f399944..7c062d71a72cf7849712cd4f5f8fe08ff29454a0 100644 (file)
--- 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:
 // Purpose:     Memory checking implementation
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:


@@ -13,23 +13,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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
 #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
 #endif
 
 #if wxUSE_THREADS

-#include "wx/thread.h"
+    #include "wx/thread.h"

 #endif
 
 #include "wx/log.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
 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 c307f80fa6f6ad3252d14e5f38b72964506ffa12..7f1cbfa40bb1c29dfe7c47bcb21238ef5413af11 100644 (file)
--- 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:
 // Purpose:     Paper size classes
 // Author:      Julian Smart
 // Modified by:


@@ -13,18 +13,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #ifndef WX_PRECOMP
 #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"
 #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_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);
     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
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE

-

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 7b910540b235ef03a46a79821c116b17ad09ea52..3b977cc7795136e56b2e4a094a250841c6ee75bf 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -13,27 +13,25 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #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"
 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index b8a96b2f5f471afa902555a560147459973fe123..a3b1c1767fbfa3fff895f1dc776200a45e0fe838 100644 (file)
--- 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:
 // Purpose:     Network address manager
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -13,13 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SOCKETS
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_SOCKETS
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/object.h"
     #include "wx/log.h"
     #include "wx/intl.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 ba55e1ce96c6562ea4aae067a2c737fd7a45b179..adf5a85c909310077a77d06ef661093b8a5822c1 100644 (file)
--- 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:
 // Purpose:     File protocol
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -13,15 +13,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"

 #endif
 
 #endif
 

-#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
-

 #include <stdio.h>
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 #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
 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE

-

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 54d72931c8e15f093350372e33f96f11ab638513..56ce74de65b4c918ece96b193a2ded126b612962 100644 (file)
--- 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:
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -13,15 +13,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_SOCKETS && wxUSE_STREAMS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
-

 #include "wx/stream.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
 #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 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 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 90cacfeb9dabb2908a20522ff38e55fa41d0b7da..77e7e67f53e2acbfd1b714873c3159fb04ed88a7 100644 (file)
--- 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$
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -23,7 +23,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/utils.h"
     #include "wx/settings.h"
 #endif //WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #endif //WX_PRECOMP

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 73dde47896f15a1c358f7d203881d98ec6d6ffe2..9d1bb67a26805b2ddeb2ac3cdd1d6e1670165d30 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -22,20 +22,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_STREAMS
-

 #include <ctype.h>
 #include "wx/stream.h"
 #include "wx/datstrm.h"
 #include "wx/textfile.h"
 #include <ctype.h>
 #include "wx/stream.h"
 #include "wx/datstrm.h"
 #include "wx/textfile.h"

-#include "wx/log.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants

diff --git a/src/common/string.cpp b/src/common/string.cpp
index aa039f976be436ac4687830a5f0032679d8f44ed..b4735f8d07a507380082438845c58f6eeebf772e 100644 (file)
--- 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:
 // Purpose:     wxString class
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:


@@ -25,14 +25,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #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 <ctype.h>
 #endif
 
 #include <ctype.h>


@@ -40,7 +39,7 @@
 #include <stdlib.h>
 
 #ifdef __SALFORDC__
 #include <stdlib.h>
 
 #ifdef __SALFORDC__

-  #include <clib.h>
+    #include <clib.h>

 #endif
 
 // allocating extra space for each string consumes more memory but speeds up
 #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 b08d6cf20d61ba210800e0505a3f3bb53254df17..1ffc0a1db170d62b9068219cf931ee2be4260e29 100644 (file)
--- 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:
 // 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"
 
 // 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
 
 
 #ifdef wxHAS_TASK_BAR_ICON
 

+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+

 // DLL options compatibility check:
 // DLL options compatibility check:

-#include "wx/app.h"

 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
 
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
 

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index ff8d3faf6f3aec734ebe10bbb970ae905e62a92c..46c0a4cbb7902c92566e7901132e8fcb2e9d7b7f 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -13,31 +13,27 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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
 #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"
 #endif
 
 #include "wx/spinctrl.h"

diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index 39d225707d1cdeccf5ce7ac685dff2c81b9ecf21..b41574d65c3c190819bf3100443eb6581b254083 100644 (file)
--- 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:
 // Purpose:     wxValidator
 // Author:      Julian Smart
 // Modified by:


@@ -13,24 +13,20 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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
 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP

-  #include "wx/window.h"
+    #include "wx/window.h"

 #endif
 
 #include "wx/validate.h"
 
 const wxValidator wxDefaultValidator;
 
 #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_
 
 // 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 a18e65850abf7c071be7387ad19e2c0b550610cb..6b903252e1fd2e868af6d63c6e83e38a13d859be 100644 (file)
--- 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/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"
     #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 d70f0f5350d7ea778835619dc3fa6484858b4614..0f8e76ccbb2cd07dd7ff014d82af64f69f2dc7db 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -17,7 +17,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #define _ISOC9X_SOURCE 1 // to get vsscanf()
 #endif
 
 #define _ISOC9X_SOURCE 1 // to get vsscanf()


@@ -28,24 +28,23 @@
 #include <string.h>
 
 #ifndef __WXWINCE__
 #include <string.h>
 
 #ifndef __WXWINCE__

-#include <time.h>
-#include <locale.h>
+    #include <time.h>
+    #include <locale.h>

 #else
 #else

-#include "wx/msw/wince/time.h"
+    #include "wx/msw/wince/time.h"

 #endif
 
 #ifndef WX_PRECOMP
 #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 <windef.h>
 #endif
 
 #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
   #include <windef.h>

-  #include <winbase.h>
-  #include <winnls.h>
-  #include <winnt.h>
+    #include <winbase.h>
+    #include <winnls.h>
+    #include <winnt.h>

 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 12612d62ba7854836b057579c3e2ed51067c76d7..6fd4fb11aa9899e1e2526394f6a6c5577b64eca8 100644 (file)
--- 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$
 // Purpose:     wxXPMDecoder
 // Author:      John Cristy, Vaclav Slavik
 // RCS-ID:      $Id$


@@ -94,21 +94,20 @@ license is as follows:
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_XPM
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_XPM
-

 #include "wx/stream.h"
 #include "wx/image.h"
 #include "wx/utils.h"
 #include "wx/stream.h"
 #include "wx/image.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/hashmap.h"
 #include "wx/hashmap.h"

-#include "wx/intl.h"

 #include <string.h>
 
 #include <ctype.h>
 #include <string.h>
 
 #include <ctype.h>

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 981d506d2023d36f2b0c105f331aad4ff51b1239..78a447191075d716a10560b67f898e664b1474e7 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -11,18 +11,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
-

 #include "wx/zipstrm.h"
 #include "wx/zipstrm.h"

-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #include "wx/mstream.h"