Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm
index fcfed2c0a5fb376e5098d4208921698376f3212b..47619d7d27ee08a01c5bd931e1086da317f4483e 100644 (file)
--- a/src/cocoa/combobox.mm
+++ b/src/cocoa/combobox.mm
@@ -80,6 +80,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"


@@ -160,7 +161,6 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 
 #include "wx/app.h"
 #include "wx/combobox.h"
 
 #include "wx/app.h"
 #include "wx/combobox.h"

-#include "wx/log.h"

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 1090664724b366f2882a46d4991a4c7794f96471..af1e4c34501ae704145520b49d2beb54930f387b 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -21,11 +21,15 @@
     defined(__WXMOTIF__) || \
     defined(__WXX11__)
 
     defined(__WXMOTIF__) || \
     defined(__WXX11__)
 

+#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif // WX_PRECOMP
+

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

-#include "wx/bitmap.h"

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/log.h"

 #include "wx/image.h"
 #include "wx/module.h"
 
 #include "wx/image.h"
 #include "wx/module.h"
 

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index c7b4dbf77befc3a467f481de6967cd7470ca0071..1e3ca85951ea639a100f95209f499a04eed25bea 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cmndata.cpp
+// Name:        src/common/cmndata.cpp

 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:


@@ -24,16 +24,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/cmndata.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/log.h"

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

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

 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index efd9cad8906106dddc4827b1888c1448a49d0c9b..4c7d7c088f5669113e43cbb544844f678b39e4df 100644 (file)
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -19,9 +19,11 @@
 
 #include "wx/colour.h"
 
 
 #include "wx/colour.h"
 

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

 
 

+#include "wx/gdicmn.h"

 
 
 // ============================================================================
 
 
 // ============================================================================

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 62c14b241460dfad2aee3b704207ef21d16dddef..0e176f4f89de5da6022b59192778963d252aea84 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -28,9 +28,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/arrstr.h"
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 #include "wx/arrstr.h"
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index e51fbcf72b5d8e17a37212758c44928c19817d4b..099ac32589ba7091977efcb494cb296946982a2f 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -24,15 +24,19 @@
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"
 #endif
 
 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"

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

 #include "wx/filefn.h"
 #include "wx/filefn.h"

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

 #include "wx/utils.h"
 #include "wx/filename.h"        // for SplitPath()
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/filename.h"        // for SplitPath()
 #include "wx/app.h"


@@ -245,7 +249,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;

-        wxCHECK_MSG( traits, _T(""),
+        wxCHECK_MSG( traits, wxEmptyString,

                      _("can't query for GUI plugins name in console applications") );
         suffix = traits->GetToolkitInfo().shortName;
     }
                      _("can't query for GUI plugins name in console applications") );
         suffix = traits->GetToolkitInfo().shortName;
     }

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 2e4468252f2ebe63e57aa318e7a38718ef3db1ba..983212f6cb89c39e64d1d0011d7cb9a4de01a8e2 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -27,11 +27,11 @@
     #include  "wx/dynarray.h"
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include  "wx/dynarray.h"
     #include  "wx/string.h"
     #include  "wx/intl.h"

+    #include  "wx/log.h"

 #endif  //WX_PRECOMP
 
 #include  "wx/app.h"
 #include  "wx/file.h"
 #endif  //WX_PRECOMP
 
 #include  "wx/app.h"
 #include  "wx/file.h"

-#include  "wx/log.h"

 #include  "wx/textfile.h"
 #include  "wx/memtext.h"
 #include  "wx/config.h"
 #include  "wx/textfile.h"
 #include  "wx/memtext.h"
 #include  "wx/config.h"

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 81f3e18eb1741e7eedd3b50f33feb8acbe811acb..4403c83db9457802cdbbeb93f7cfb1fe23330476 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -26,6 +26,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -52,8 +53,6 @@
     #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
     #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

-#include "wx/log.h"
-

 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
     #include "wx/msw/mslu.h"
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
     #include "wx/msw/mslu.h"

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index e06b3d80773f9fecd21c1049959e73518d1cdb31..65cc39f1c0e8cf9cdeb1af6d4102e82481b93be3 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filesys.cpp
+// Name:        src/common/filesys.cpp

 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik


@@ -10,18 +10,22 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 
 #if wxUSE_FILESYSTEM
 
 #endif
 
 
 #if wxUSE_FILESYSTEM
 

+#include "wx/filesys.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

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

-#include "wx/filesys.h"

 #include "wx/mimetype.h"
 #include "wx/filename.h"
 #include "wx/mimetype.h"
 #include "wx/filename.h"

-#include "wx/log.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -36,7 +40,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
     wxString ext, mime;
     wxString loc = GetRightLocation(location);
     wxChar c;
     wxString ext, mime;
     wxString loc = GetRightLocation(location);
     wxChar c;

-    int l = loc.Length(), l2;
+    int l = loc.length(), l2;

 
     l2 = l;
     for (int i = l-1; i >= 0; i--)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--)


@@ -120,7 +124,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;

-    int i, l = location.Length();
+    int i, l = location.length();

     bool fnd = false;
 
     for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
     bool fnd = false;
 
     for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {


@@ -137,7 +141,7 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
     int i;
     bool fnd = false;
 
     int i;
     bool fnd = false;
 

-    for (i = location.Length()-1; i >= 0; i--) {
+    for (i = location.length()-1; i >= 0; i--) {

         if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
         else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
     }
         if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
         else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
     }


@@ -146,7 +150,7 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
 
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {

-    int i, l = location.Length();
+    int i, l = location.length();

     int l2 = l + 1;
 
     for (i = l-1;
     int l2 = l + 1;
 
     for (i = l-1;


@@ -163,7 +167,7 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
     wxChar c;
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
     wxChar c;

-    int l = location.Length();
+    int l = location.length();

 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];


@@ -256,7 +260,7 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString r;
     int i, j, cnt;
 
     wxString r;
     int i, j, cnt;
 

-    cnt = p.Length();
+    cnt = p.length();

     for (i = 0; i < cnt; i++)
       if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     for (i = 0; i < cnt; i++)
       if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 


@@ -275,7 +279,7 @@ static wxString MakeCorrectPath(const wxString& path)
         r << p.GetChar(i);
         if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
         {
         r << p.GetChar(i);
         if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
         {

-            for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}

             if (j >= 0 && r.GetChar(j) != wxT(':'))
             {
                 for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
             if (j >= 0 && r.GetChar(j) != wxT(':'))
             {
                 for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}


@@ -298,13 +302,13 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
     if (is_dir)
     {
 
     if (is_dir)
     {

-        if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+        if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))

             m_Path << wxT('/');
     }
 
     else
     {
             m_Path << wxT('/');
     }
 
     else
     {

-        for (i = m_Path.Length()-1; i >= 0; i--)
+        for (i = m_Path.length()-1; i >= 0; i--)

         {
             if (m_Path[(unsigned int) i] == wxT('/'))
             {
         {
             if (m_Path[(unsigned int) i] == wxT('/'))
             {


@@ -326,7 +330,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
         }
         if (pathpos == -1)
         {
         }
         if (pathpos == -1)
         {

-            for (i = 0; i < (int) m_Path.Length(); i++)
+            for (i = 0; i < (int) m_Path.length(); i++)

             {
                 if (m_Path[(unsigned int) i] == wxT(':'))
                 {
             {
                 if (m_Path[(unsigned int) i] == wxT(':'))
                 {


@@ -334,7 +338,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
                     break;
                 }
             }
                     break;
                 }
             }

-            if (i == (int) m_Path.Length())
+            if (i == (int) m_Path.length())

                 m_Path = wxEmptyString;
         }
         else
                 m_Path = wxEmptyString;
         }
         else


@@ -354,7 +358,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     wxFSFile *s = NULL;
     wxList::compatibility_iterator node;
 
     wxFSFile *s = NULL;
     wxList::compatibility_iterator node;
 

-    ln = loc.Length();
+    ln = loc.length();

     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {


@@ -411,7 +415,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 
     m_FindFileHandler = NULL;
 
 
     m_FindFileHandler = NULL;
 

-    for (int i = spec2.Length()-1; i >= 0; i--)
+    for (int i = spec2.length()-1; i >= 0; i--)

         if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     node = m_Handlers.GetFirst();
         if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     node = m_Handlers.GetFirst();


@@ -491,7 +495,7 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url)
     }
     else if ( (url.Find(wxT("file://")) == 0) &&
               (path.Find(wxT('/')) != wxNOT_FOUND) &&
     }
     else if ( (url.Find(wxT("file://")) == 0) &&
               (path.Find(wxT('/')) != wxNOT_FOUND) &&

-              (path.Length() > 1) && (path[1u] != wxT(':')) )
+              (path.length() > 1) && (path[1u] != wxT(':')) )

     {
         path = wxT("//") + path;
     }
     {
         path = wxT("//") + path;
     }


@@ -555,6 +559,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
   // wxUSE_FILESYSTEM
 
 #endif
   // wxUSE_FILESYSTEM

-
-
-

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index f1521cac763a2eeadb077b016d65293607ecc0e2..d04a4b4f428a04ee6f80ba818ccc8d30e1ba19a1 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -20,8 +20,13 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/event.h"

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/event.h"

 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/bitmap.h"
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/bitmap.h"


@@ -35,7 +40,6 @@
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 
 #include "wx/settings.h"
 #include "wx/hashmap.h"
 

-#include "wx/log.h"

 #include <string.h>
 
 #ifdef __WXMOTIF__
 #include <string.h>
 
 #ifdef __WXMOTIF__

diff --git a/src/common/geometry.cpp b/src/common/geometry.cpp
index db4ff7c671ab5e0215769b5f01bf34643de01452..362b1aee50b23d31a337340a09edf6071792247e 100644 (file)
--- a/src/common/geometry.cpp
+++ b/src/common/geometry.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/geometry.cpp
+// Name:        src/common/geometry.cpp

 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     Common Geometry Classes
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,17 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GEOMETRY
 
 #endif
 
 #if wxUSE_GEOMETRY
 

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

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

-#include "wx/geometry.h"

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 15b611ee645777adb64fdd40a9b5fed792d7193e..4c1a6205c9fc967041cd44d17c69c7960af090e3 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -20,9 +20,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------


@@ -184,4 +184,4 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-#endif // wxUSE_PNM
+#endif // wxUSE_IMAGE && wxUSE_PNM

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 252c6b09bbf73b1594380a44763e8ba0453f5796..d7a7e7e895a5af754782b5084301811e89f8089a 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        log.cpp
+// Name:        src/common/log.cpp

 // Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -28,6 +28,7 @@
 
 // wxWidgets
 #ifndef WX_PRECOMP
 
 // wxWidgets
 #ifndef WX_PRECOMP

+    #include "wx/log.h"

     #include "wx/app.h"
     #include "wx/arrstr.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/arrstr.h"
     #include "wx/intl.h"


@@ -36,7 +37,6 @@
 
 #include "wx/apptrait.h"
 #include "wx/file.h"
 
 #include "wx/apptrait.h"
 #include "wx/file.h"

-#include "wx/log.h"

 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"


@@ -833,4 +833,3 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 }
 
 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG

-

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 7c062d71a72cf7849712cd4f5f8fe08ff29454a0..acd63dcde9aa6cab2d7ff7a353f1f0adf9f99b53 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -18,17 +18,19 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 

+#include "wx/memory.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/hash.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/hash.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
 #endif
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 

-#include "wx/log.h"

 #include <stdlib.h>
 
 #include "wx/ioswrap.h"
 #include <stdlib.h>
 
 #include "wx/ioswrap.h"


@@ -54,8 +56,6 @@
 
 #endif
 
 
 #endif
 

-#include "wx/memory.h"
-

 #if wxUSE_THREADS && defined(__WXDEBUG__)
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #if wxUSE_THREADS && defined(__WXDEBUG__)
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 44f0fbe1087da998ef50aea5f3bbf2250f768ef2..27d4b8d4295cc0f0fa1f018967f4053dd5aa5581 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -33,10 +33,10 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/module.h"
 #endif //WX_PRECOMP
 
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"

diff --git a/src/common/module.cpp b/src/common/module.cpp
index aebe228545e2fefd5f533ed56b4e0b26467ee4b0..961d478d933c55cb1036e3da6210d90cc8ba2e03 100644 (file)
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -21,9 +21,9 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/listimpl.cpp"
 
 #define TRACE_MODULE _T("module")
 #include "wx/listimpl.cpp"
 
 #define TRACE_MODULE _T("module")

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index b0c10d92b3468be753765bf6a4f31504106f4e68..2ed2037f4cfa68c6aa564fc1e4039584ed9662a9 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/msgout.cpp
+// Name:        src/common/msgout.cpp

 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:


@@ -29,6 +29,7 @@
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI


@@ -36,8 +37,6 @@
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"

-#include "wx/log.h"
-

 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 


@@ -221,4 +220,3 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI

-

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 65eb47d40406064d1d892d83c4bf67cacd475bdd..43a51d19a17fde6ecff4d9b7517e98e5a83635d8 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -28,6 +28,7 @@
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -35,7 +36,6 @@
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/event.h"
 
 #include "wx/sckaddr.h"
 #include "wx/event.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index f3b4ffc4dd83d834f6f69aa9c5422f774273be41..3dc3214091766560b5a8c0e4f984388958633f36 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -22,10 +22,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 // normally, the compiler options should contain -I../zlib, but it is
 // apparently not the case for all MSW makefiles and so, unless we use
 
 // normally, the compiler options should contain -I../zlib, but it is
 // apparently not the case for all MSW makefiles and so, unless we use

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index c0f98169c9dba4b1952f3934754605771fba5308..b03090fb68fbc4c59b62128f3353551296597e26 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -6,7 +6,7 @@
 // Created:     2006-04-13
 // Id:          $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
 // Created:     2006-04-13
 // Id:          $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,

-//              SciTech Software, Inc. 
+//              SciTech Software, Inc.

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -28,15 +28,16 @@
 // Currently, only for Mac as a toolbar replacement.
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
 
 // Currently, only for Mac as a toolbar replacement.
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
 

+#include "wx/generic/buttonbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/generic/buttonbar.h"

 #include "wx/frame.h"
 #include "wx/image.h"
 #include "wx/frame.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/settings.h"
 #include "wx/dcclient.h"
 
 #include "wx/settings.h"
 #include "wx/dcclient.h"
 


@@ -62,7 +63,7 @@ public:
         m_x = m_y = wxDefaultCoord;
         m_width =
         m_height = 0;
         m_x = m_y = wxDefaultCoord;
         m_width =
         m_height = 0;

-        
+

         m_button = NULL;
     }
 
         m_button = NULL;
     }
 


@@ -118,7 +119,7 @@ void wxButtonToolBar::Init()
 
     m_labelMargin = 2;
     m_labelHeight = 0;
 
     m_labelMargin = 2;
     m_labelHeight = 0;

-    
+

     SetMargins(8, 2);
     SetToolPacking(8);
 }
     SetMargins(8, 2);
     SetToolPacking(8);
 }


@@ -347,10 +348,10 @@ bool wxButtonToolBar::Realize()
 {
     if ( !wxToolBarBase::Realize() )
         return false;
 {
     if ( !wxToolBarBase::Realize() )
         return false;

-    
+

     m_needsLayout = true;
     DoLayout();
     m_needsLayout = true;
     DoLayout();

-    
+

     SetBestSize(wxSize(m_maxWidth, m_maxHeight));
 
     return true;
     SetBestSize(wxSize(m_maxWidth, m_maxHeight));
 
     return true;


@@ -378,7 +379,7 @@ void wxButtonToolBar::DoLayout()
 
         tool->m_x = x;
         tool->m_y = y;
 
         tool->m_x = x;
         tool->m_y = y;

-        
+

         if (tool->IsButton())
         {
             if (!tool->GetButton())
         if (tool->IsButton())
         {
             if (!tool->GetButton())


@@ -387,14 +388,14 @@ void wxButtonToolBar::DoLayout()
                                                                wxBU_AUTODRAW|wxBORDER_NONE);
                 if (!tool->GetShortHelp().IsEmpty())
                     bmpButton->SetLabel(tool->GetShortHelp());
                                                                wxBU_AUTODRAW|wxBORDER_NONE);
                 if (!tool->GetShortHelp().IsEmpty())
                     bmpButton->SetLabel(tool->GetShortHelp());

-                
+

                 tool->SetButton(bmpButton);
             }
             else
             {
                 tool->GetButton()->Move(wxPoint(tool->m_x, tool->m_y));
             }
                 tool->SetButton(bmpButton);
             }
             else
             {
                 tool->GetButton()->Move(wxPoint(tool->m_x, tool->m_y));
             }

-            
+

             int w = widthTool;
             if (tool->GetButton())
             {
             int w = widthTool;
             if (tool->GetButton())
             {


@@ -553,4 +554,3 @@ void wxButtonToolBar::OnLeftUp(wxMouseEvent& event)
 }
 
 #endif // wxUSE_TOOLBAR && wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_TOOLBAR && wxUSE_BMPBUTTON

-

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 86d9c8ac6822e6dc50a4c781afe8896854e3cf68..a0617a7b5c106c8cd2872813847ae1641eacd314 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -21,13 +21,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/dcmemory.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/dcmemory.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index eeef7d9129b1cabd673425c71fbaeb8278aeda25..a29d5809e4d7ac3f5a05fc0bace62253c3dbfc64 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -37,7 +38,6 @@
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
 #include "wx/icon.h"
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
 #include "wx/icon.h"

-#include "wx/log.h"

 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index f171e1476748f189b8aea1ab62bdafca3f780d4d..b40140c453e6da513a7d19e132e65d277c9aa98c 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -35,10 +35,9 @@
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
 
 #if wxUSE_IMAGE_IN_DRAGIMAGE
 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
 
 #if wxUSE_IMAGE_IN_DRAGIMAGE

diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index b1e79b5969e6cd7c4457887b34f60e7324c9767b..4f002030ea2783ca5283bf256424419e697fdb93 100644 (file)
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -24,13 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/generic/mdig.h"
+

 #ifndef WX_PRECOMP
     #include "wx/panel.h"
     #include "wx/menu.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
     #include "wx/menu.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/generic/mdig.h"

 #include "wx/stockitem.h"
 
 enum MDI_MENU_ID
 #include "wx/stockitem.h"
 
 enum MDI_MENU_ID


@@ -399,7 +401,6 @@ wxGenericMDIChildFrame::wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 

-#include "wx/log.h"

 wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
 {
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
 wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
 {
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();


@@ -812,4 +813,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
 
 #endif
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
 
 #endif

-

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 8eab2fc19df7ab70182595680fa211cbaebe5939..c5e67adbe2749920dca00367a79dcade82248184 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -30,9 +30,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include  "wx/log.h"

 #include  "wx/settings.h"
 #include  "wx/generic/imaglist.h"
 #include  "wx/dcclient.h"
 #include  "wx/settings.h"
 #include  "wx/generic/imaglist.h"
 #include  "wx/dcclient.h"

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index a67016706f98fab983e8ea3d5baf3e8ef36ac4e7..92b513ef35f2823e79653c926647c6b2a39540ba 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mgl/timer.cpp
+// Name:        src/generic/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -20,11 +20,14 @@
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 

+#if wxUSE_TIMER
+

 #include "wx/timer.h"
 
 #include "wx/timer.h"
 

-#if wxUSE_TIMER
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-#include "wx/log.h"

 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index aeeb7ee8c09dd1c3f3aa2dabdb883b16e87189f1..d7eb518add6e64ae8d29f1f887e2aeeab414f5ac 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -20,11 +20,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"


@@ -257,7 +257,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 #if wxUSE_THREADS
         wxMutexLocker lock(gs_idleTagsMutex);
 #endif
 #if wxUSE_THREADS
         wxMutexLocker lock(gs_idleTagsMutex);
 #endif

-        g_isIdle = TRUE;
+        g_isIdle = true;

         wxTheApp->m_idleTag = 0;
     }
 
         wxTheApp->m_idleTag = 0;
     }
 


@@ -348,7 +348,7 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     gdk_threads_enter();
 
     wxMutexGuiLeave();

-    g_mainThreadLocked = TRUE;
+    g_mainThreadLocked = true;

 
     // we rely on the fact that glib GPollFD struct is really just pollfd but
     // I wonder how wise is this in the long term (VZ)
 
     // we rely on the fact that glib GPollFD struct is really just pollfd but
     // I wonder how wise is this in the long term (VZ)


@@ -428,7 +428,7 @@ wxApp::wxApp()
 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;

-    g_isIdle = TRUE;
+    g_isIdle = true;

     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS


@@ -664,7 +664,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         return false;
     }
 
         return false;
     }
 

-    wxSetDetectableAutoRepeat( TRUE );
+    wxSetDetectableAutoRepeat( true );

 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());


@@ -702,6 +702,6 @@ void wxApp::RemoveIdleTag()
     {
         g_source_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
     {
         g_source_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

-        g_isIdle = TRUE;
+        g_isIdle = true;

     }
 }
     }
 }

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index cca926b36a38936956ff3a75617ded63d1e6d0f4..228ecfcf59f76bc1fb27bb1f8edc2f8d5b847209 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/clipbrd.cpp
+// Name:        src/gtk/clipbrd.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,23 +10,19 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_CLIPBOARD
+

 #include "wx/clipbrd.h"
 
 #include "wx/clipbrd.h"
 

-#if wxUSE_CLIPBOARD
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

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

-#include "wx/log.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

-//-----------------------------------------------------------------------------
-// thread system
-//-----------------------------------------------------------------------------
-
-#if wxUSE_THREADS
-#endif
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -120,8 +116,8 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
             if (format == clipboard->m_targetRequested)
             {
 
             if (format == clipboard->m_targetRequested)
             {

-                clipboard->m_waiting = FALSE;
-                clipboard->m_formatSupported = TRUE;
+                clipboard->m_waiting = false;
+                clipboard->m_formatSupported = true;

                 return;
             }
         }
                 return;
             }
         }


@@ -184,7 +180,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 

-    wxTheClipboard->m_formatSupported = TRUE;
+    wxTheClipboard->m_formatSupported = true;

     clipboard->m_waiting = FALSE;
 }
 }
     clipboard->m_waiting = FALSE;
 }
 }


@@ -197,20 +193,20 @@ extern "C" {
 static gint
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
 static gint
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {

-    if (!wxTheClipboard) return TRUE;
+    if (!wxTheClipboard) return true;

 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
 
     if (event->selection == GDK_SELECTION_PRIMARY)
     {

-        wxTheClipboard->m_ownsPrimarySelection = FALSE;
+        wxTheClipboard->m_ownsPrimarySelection = false;

     }
     else
     if (event->selection == g_clipboardAtom)
     {
     }
     else
     if (event->selection == g_clipboardAtom)
     {

-        wxTheClipboard->m_ownsClipboard = FALSE;
+        wxTheClipboard->m_ownsClipboard = false;

     }
     else
     {
     }
     else
     {

-        wxTheClipboard->m_waiting = FALSE;
+        wxTheClipboard->m_waiting = false;

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -227,7 +223,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
         }
     }
 
         }
     }
 

-    wxTheClipboard->m_waiting = FALSE;
+    wxTheClipboard->m_waiting = false;

     return TRUE;
 }
 }
     return TRUE;
 }
 }


@@ -382,7 +378,7 @@ void wxClipboard::Clear()
         //  it, clear_selection is called which will set m_data to zero
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
         //  it, clear_selection is called which will set m_data to zero
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 4368959b6c8bf116e789e6d05bdddc9f3a472a91..cc203cb5613a29e85eb29d10ba4ce7594aae9705 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -12,8 +12,12 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

-#include "wx/log.h"

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

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

 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"


@@ -126,7 +130,7 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label)
     GtkWidget* framewidget = gtk_frame_new(NULL);
     gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget);
 
     GtkWidget* framewidget = gtk_frame_new(NULL);
     gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget);
 

-    return framewidget; //note that the label is already set so you'll 
+    return framewidget; //note that the label is already set so you'll

                         //only need to call wxControl::SetLabel afterwards
 }
 
                         //only need to call wxControl::SetLabel afterwards
 }
 


@@ -363,4 +367,3 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
 }
 
 #endif // wxUSE_CONTROLS
 }
 
 #endif // wxUSE_CONTROLS

-

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 00b429c0b4ef41ef4ae9661df49ad004d29e1bee..b1a0e714b509c9b8c50e32ca0bb8f033992c7d72 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/gtk/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_DATAOBJ
+

 #include "wx/dataobj.h"
 
 #include "wx/dataobj.h"
 

-#if wxUSE_DATAOBJ
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/uri.h"
 
 #include <gdk/gdk.h>
 #include "wx/uri.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 6ae875695ce5e7e9552fd21d11e778ede3bf9aeb..76be4d0a35cba5401d27e1dc721eb38abad029de 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -16,12 +16,15 @@
 
 #ifndef wxUSE_GENERICDATAVIEWCTRL
 
 
 #ifndef wxUSE_GENERICDATAVIEWCTRL
 

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

 #include "wx/stockitem.h"
 #include "wx/dcclient.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/sizer.h"
 #include "wx/stockitem.h"
 #include "wx/dcclient.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/sizer.h"

-#include "wx/log.h"

 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"


@@ -1349,17 +1352,17 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
 
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
     GtkTreeViewColumn *column = gtk_tree_view_column_new();
 
     gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );

-    
+

     if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
     else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
     else
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
     if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
     else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
     else
         gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );

-        
+

     if (fixed_width > 0)
         gtk_tree_view_column_set_fixed_width( column, fixed_width );
     if (fixed_width > 0)
         gtk_tree_view_column_set_fixed_width( column, fixed_width );

-    
+

     gtk_tree_view_column_pack_start( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
     gtk_tree_view_column_pack_start( column, renderer, TRUE );
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 62e70ce5d6e7b7487a81d4a10a19c2eb8729da62..6df12003f0062a1218e11edc4f19fc61388606dc 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/dcclient.cpp
+// Name:        src/gtk/dcclient.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -15,10 +15,14 @@
 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

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

 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #include "wx/gtk/win_gtk.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk/win_gtk.h"

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 14cee77258743184f65a8e8830befc4aae5aff4c..b847b0b8eff2fb6e0c9daee5985cf455a61f80c1 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -16,12 +16,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"

-#include "wx/log.h"

 #include "wx/utils.h"
 
 #include "wx/gtk/private.h"
 #include "wx/utils.h"
 
 #include "wx/gtk/private.h"

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 30330dd02d918ef844f8b4f4f1fd475c443c853d..10183aa0147b2cca3fcec31b22a6a44a58e52b6b 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/font.cpp
+// Name:        src/gtk/font.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -19,10 +19,14 @@
 #include "wx/wxprec.h"
 
 #include "wx/font.h"
 #include "wx/wxprec.h"
 
 #include "wx/font.h"

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

 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"


@@ -424,7 +428,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
 #if wxUSE_PANGO
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
 
 #if wxUSE_PANGO
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 2f93b67ba7fc19ea48004288852aa78c2c15e964..8c09929a655906f1f02d655d429c522df5fba52c 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -19,13 +19,16 @@
 
 #if wxUSE_LIBGNOMEPRINT
 
 
 #if wxUSE_LIBGNOMEPRINT
 

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

 #include "wx/math.h"
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"
 #include "wx/dcmemory.h"
 #include "wx/math.h"
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"
 #include "wx/dcmemory.h"

-#include "wx/log.h"

 #include "wx/icon.h"
 
 #include <libgnomeprint/gnome-print.h>
 #include "wx/icon.h"
 
 #include <libgnomeprint/gnome-print.h>


@@ -1160,7 +1163,7 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width,
     }
 }
 
     }
 }
 

-void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y, 
+void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,

                                         wxCoord width, wxCoord height)
 {
     double r = 4 * (sqrt (2) - 1) / 3;
                                         wxCoord width, wxCoord height)
 {
     double r = 4 * (sqrt (2) - 1) / 3;


@@ -1170,22 +1173,22 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
             halfHR = r * halfH;
     wxCoord halfWI = (wxCoord) halfW,
             halfHI = (wxCoord) halfH;
             halfHR = r * halfH;
     wxCoord halfWI = (wxCoord) halfW,
             halfHI = (wxCoord) halfH;

-            
+

     gs_lgp->gnome_print_newpath( m_gpc );
     gs_lgp->gnome_print_newpath( m_gpc );

-    
+

     // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
     gs_lgp->gnome_print_moveto( m_gpc,
     // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
     gs_lgp->gnome_print_moveto( m_gpc,

-                XLOG2DEV(x + width), 
+                XLOG2DEV(x + width),

                 YLOG2DEV(y + halfHI) );
     gs_lgp->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
                 YLOG2DEV(y + halfHI) );
     gs_lgp->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),

-                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)), 
+                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),

                 YLOG2DEV(y + height),
                 YLOG2DEV(y + height),

-                XLOG2DEV(x + halfWI), 
+                XLOG2DEV(x + halfWI),

                 YLOG2DEV(y + height) );
     gs_lgp->gnome_print_curveto( m_gpc,
                 YLOG2DEV(y + height) );
     gs_lgp->gnome_print_curveto( m_gpc,

-                XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)), 
+                XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),

                 YLOG2DEV(y + height),
                 XLOG2DEV(x),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
                 YLOG2DEV(y + height),
                 XLOG2DEV(x),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),


@@ -1202,7 +1205,7 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
                 XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
                 XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );

-                
+

     gs_lgp->gnome_print_closepath(m_gpc);
 }
 
     gs_lgp->gnome_print_closepath(m_gpc);
 }
 


@@ -1534,7 +1537,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
         case wxSHORT_DASH:    gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
         case wxLONG_DASH:     gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
         case wxDOT_DASH:      gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
         case wxSHORT_DASH:    gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
         case wxLONG_DASH:     gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
         case wxDOT_DASH:      gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;

-        case wxUSER_DASH: 
+        case wxUSER_DASH:

         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes
         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes

diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp
index db197126e252afcd754df4c1247c879c55c30c11..aa25c84098d24a73cb630bc833873ce98309cb88 100644 (file)
--- a/src/gtk/gnome/gvfs.cpp
+++ b/src/gtk/gnome/gvfs.cpp
@@ -19,11 +19,14 @@
 
 #if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
 
 
 #if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
 

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

 #include "wx/mimetype.h"
 #include "wx/gtk/private.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"
 #include "wx/mimetype.h"
 #include "wx/gtk/private.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"

-#include "wx/log.h"

 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 


@@ -62,7 +65,7 @@ public:
         (), (), FALSE )
     wxDL_METHOD_DEFINE( void, gnome_vfs_shutdown,
         (), (), /**/ )
         (), (), FALSE )
     wxDL_METHOD_DEFINE( void, gnome_vfs_shutdown,
         (), (), /**/ )

-        
+

     wxDL_METHOD_DEFINE( GnomeVFSResult, gnome_vfs_mime_set_icon,
         (const char *mime_type, const char *filename), (mime_type, filename), GNOME_VFS_OK )
 };
     wxDL_METHOD_DEFINE( GnomeVFSResult, gnome_vfs_mime_set_icon,
         (const char *mime_type, const char *filename), (mime_type, filename), GNOME_VFS_OK )
 };


@@ -98,7 +101,7 @@ void wxGnomeVFSLibrary::InitializeMethods()
 
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_init, success )
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_shutdown, success )
 
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_init, success )
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_shutdown, success )

-    
+

     m_ok = true;
 }
 
     m_ok = true;
 }
 


@@ -125,7 +128,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
                        const wxString& strDesc)
 {
     int nIndex = AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);
                        const wxString& strDesc)
 {
     int nIndex = AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);

-    
+

     if ( nIndex == wxNOT_FOUND )
         return false;
 
     if ( nIndex == wxNOT_FOUND )
         return false;
 


@@ -134,7 +137,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
         // User modificationt to the MIME database
         // are not supported :-)
     }
         // User modificationt to the MIME database
         // are not supported :-)
     }

-        
+

     return false;
 }
 
     return false;
 }
 


@@ -168,7 +171,7 @@ void wxGnomeVFSModule::OnExit()
 {
     if (gs_lgvfs->IsOk())
         gs_lgvfs->gnome_vfs_shutdown();
 {
     if (gs_lgvfs->IsOk())
         gs_lgvfs->gnome_vfs_shutdown();

-        
+

     delete gs_lgvfs;
 }
 
     delete gs_lgvfs;
 }
 

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 6df91cf93f6924b949135f156d83c7723174bf14..82f03469c6ad06311acde4ebbe1ac72961086e92 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -18,13 +18,13 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"
 #endif
 
 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"

-#include "wx/log.h"

 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index aa3a7bee524d7f2f570a79e2a14dd719427911ec..6a60ddb0b4c2a452e3c6eadde7e7c56fbe10f855 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/app.h"
 #include "wx/bitmap.h"
 
 #include "wx/app.h"
 #include "wx/bitmap.h"
 

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 1e29e55f493fd53c09bc990ee36cd6a33fdcc113..9d5cf1a053a1112e1bf42f9b6afd1ea5cef73a82 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -16,12 +16,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
 #endif
 
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"

-#include "wx/log.h"

 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 86778400df3d1f22e6dae2cd64a8b584c6f5ff14..63622d81c1dff2cd0e2e68663cb38875bd6b2a1e 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -14,9 +14,12 @@
 
 #include "wx/radiobox.h"
 
 
 #include "wx/radiobox.h"
 

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

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"

-#include "wx/log.h"

 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 71cc667463f521cd646f8923f502bd867f02a18d..4db9d7755f11db37bf19685302a4fe9a0ac15866 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/region.cpp
+// Name:        src/gtk/region.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed


@@ -19,8 +19,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

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

 #include "wx/region.h"
 #include "wx/region.h"

-#include "wx/log.h"

 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 
 


@@ -524,4 +527,3 @@ wxRect wxRegionIterator::GetRect() const
 
     return r;
 }
 
     return r;
 }

-

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 8861bd816c0a00731e09e2d56a0ef147ad51f75b..9d9232d7c9b8f90b772f6a22b837e94ef462134b 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// File:        taskbar.cpp
+// File:        src/gtk/taskbar.cpp

 // Purpose:     wxTaskBarIcon (src/unix/taskbarx11.cpp) helper for GTK2
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxTaskBarIcon (src/unix/taskbarx11.cpp) helper for GTK2
 // Author:      Vaclav Slavik
 // Modified by:


@@ -13,7 +13,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/gtk/taskbarpriv.h"
 #include "wx/wxprec.h"
 
 #include "wx/gtk/taskbarpriv.h"

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

 #include "wx/frame.h"
 #include "wx/menu.h"
 
 #include "wx/frame.h"
 #include "wx/menu.h"
 

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 7705302842ea09fd08a1d97880ad0f4e1149cc03..3b3cd28c2dc9ae147d10aa93557db71b6569fa21 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -14,10 +14,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"

diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index deb4a9251c837854c7ff51fb2e3d921b68b732a7..50e012ad3baff8eea50b2db6b6c6033cf6cbf0d6 100644 (file)
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        thread.cpp
+// Name:        src/gtk/thread.cpp

 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -13,9 +13,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"

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

 #include "wx/wx.h"
 #include "wx/module.h"
 #include "wx/wx.h"
 #include "wx/module.h"

-#include "wx/log.h"

 
 wxMutex::wxMutex()
 {
 
 wxMutex::wxMutex()
 {

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index 204b4e4663e86100322bbb4f2e76434a8616a033..bfbdec4d7a4130ddd0f1d367b6638b5eadd33c39 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        threadsgi.cpp
+// Name:        src/gtk/threadsgi.cpp

 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:
 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:


@@ -13,6 +13,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"

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

 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>
 


@@ -21,7 +26,6 @@
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include "wx/utils.h"
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -266,4 +270,3 @@ void wxThreadModule::OnExit()
     wxThreadGuiExit();
     delete wxMainMutex;
 }
     wxThreadGuiExit();
     delete wxMainMutex;
 }

-

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 627bc9e3de31e9cc8502418f3bd2b499340ccbdd..904220c40be79ceedb2cc02f81b6fef050a14210 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -23,7 +23,11 @@
 #endif
 
 #include "wx/toplevel.h"
 #endif
 
 #include "wx/toplevel.h"

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

 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp
index d5c5ddff1d2df9872b4554f4fd8d865f14f03627..3eedd1748687ae49f2bf17dd0858c1ee5a6627d8 100644 (file)
--- a/src/gtk/treegtk.cpp
+++ b/src/gtk/treegtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.cpp
+// Name:        src/gtk/treectrl.cpp

 // Purpose:     wxTreeCtrl
 // Author:      Denis Pershin
 // Modified by:
 // Purpose:     wxTreeCtrl
 // Author:      Denis Pershin
 // Modified by:


@@ -13,16 +13,16 @@
 #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/wx.h"
+    #include "wx/wx.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/gtk/treectrl.h"
 #include "wx/textctrl.h"
 #endif
 
 #include "wx/gtk/treectrl.h"
 #include "wx/textctrl.h"

-#include "wx/log.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -186,16 +186,17 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList) {
   m_imageListState = imageList;
 }
 
   m_imageListState = imageList;
 }
 

-wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const {
-  char *t;
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const
+{
+    char *t;

 
 

-  if (!item.IsOk())
-    return wxString("");
+    if (!item.IsOk())
+        return wxEmptyString;

 
 

-  GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
-  gtk_label_get(l, &t);
+    GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
+    gtk_label_get(l, &t);

 
 

-  return t;
+    return t;

 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const {
 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const {

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1a65822ba32a040141c6bc1177850fad8a3c2ff2..f615293ba2820909c5934af7497aea4182d7fdd2 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -15,10 +15,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 1b970632197f4eb8cdcdf48ae5b3ee9d8b3e8baf..ea43bbd03f2a8820ff0ffc4f6ddaec32dfcb5ee6 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/config.h"
 #include "wx/app.h"
 
 #include "wx/config.h"
 #include "wx/app.h"
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 40b265aa8470e7d3f478b930daef000f5090e038..230cf90c468473bd180257b94f6a2ab07c18c1a5 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -52,7 +53,6 @@
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/settings.h"
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/settings.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 5858c7570cf1370b1f05e10a7710d0222933684c..9c6a6f99371338b0d0faaf2a4970e4d42f4fbfa9 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -20,11 +20,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/memory.h"
 #include "wx/font.h"
 #include "wx/settings.h"

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 9f06257b3d91cc1f713d2e8fe623df9ff45dad19..02f3374010cba02bf4604bbf84f29788db08e9d6 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/clipbrd.cpp
+// Name:        src/gtk1/clipbrd.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,25 +10,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_CLIPBOARD
+

 #include "wx/clipbrd.h"
 
 #include "wx/clipbrd.h"
 

-#if wxUSE_CLIPBOARD
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

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

-#include "wx/log.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

-//-----------------------------------------------------------------------------
-// thread system
-//-----------------------------------------------------------------------------
-
-#if wxUSE_THREADS
-#endif
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -642,4 +638,3 @@ bool wxClipboard::GetData( wxDataObject& data )
 
 #endif
   // wxUSE_CLIPBOARD
 
 #endif
   // wxUSE_CLIPBOARD

-

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 8917ed25dba58b75e45e49ed741d80999a24f0e2..d77a65f4e8b37acaeddb54de970beb43ff3767ad 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -12,8 +12,12 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

-#include "wx/log.h"

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

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

 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk1/private.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk1/private.h"


@@ -260,4 +264,3 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
 }
 
 #endif // wxUSE_CONTROLS
 }
 
 #endif // wxUSE_CONTROLS

-

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 7fdc0744fbbb03604cf41d6d907672d7f5f35b83..241ac078a0fcc3c720bdb3f93c3182fad7919d31 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/gtk1/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_DATAOBJ
+

 #include "wx/dataobj.h"
 
 #include "wx/dataobj.h"
 

-#if wxUSE_DATAOBJ
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/uri.h"
 
 #include <gdk/gdk.h>
 #include "wx/uri.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 9e8c3de0e7ade68cfc94ad9410225d7a87eca9cb..b326e0d15219f4d10bb0c49bb7c2634a42896942 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/dcclient.cpp
+// Name:        src/gtk1/dcclient.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -15,10 +15,14 @@
 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

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

 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #include "wx/gtk1/win_gtk.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk1/win_gtk.h"

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 29094ff240ad3daf28bf131a12391129ec88bb40..f1c5971ae67eb71b38e07fce85eb36fbd7c76f96 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index def79ff7faf6721c487a1aeda8fd3256a95693f1..4014c067a6e54dd421bb564bcdbdeec34fa43a72 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/font.cpp
+// Name:        src/gtk/font.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -19,10 +19,14 @@
 #include "wx/wxprec.h"
 
 #include "wx/font.h"
 #include "wx/wxprec.h"
 
 #include "wx/font.h"

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

 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"


@@ -546,7 +550,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
 #if wxUSE_PANGO
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
 
 #if wxUSE_PANGO
     return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 502346ec53d20ba40c576d8cac4d5b6fde1e9bcf..edde839bcf3383cee30a4b46a55733d22badcbb4 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/app.h"
 #include "wx/bitmap.h"
 
 #include "wx/app.h"
 #include "wx/bitmap.h"
 

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 6cad559cbd4bdd65cbbbf170eb361846a28cb42d..d5b088777623f501c60e840c7e5b498619dae9e3 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -16,12 +16,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"
 #endif
 
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/imaglist.h"

-#include "wx/log.h"

 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 
 #include "wx/bitmap.h"
 #include "wx/fontutil.h"
 

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 8b980c12f7bd635373f24ee9f34f95d53c74b5fa..83252b6c3739997618d067899e83dca96bc1605e 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -14,9 +14,12 @@
 
 #include "wx/radiobox.h"
 
 
 #include "wx/radiobox.h"
 

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

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"

-#include "wx/log.h"

 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 2e212047d1a4f13035c733f0aa3077ce6badf356..f0eadcdc005f2881db513439c4206e92867fc055 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/region.cpp
+// Name:        src/gtk1/region.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed


@@ -20,7 +20,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/region.h"
 #include "wx/wxprec.h"
 
 #include "wx/region.h"

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

 #include "wx/gtk1/private.h"
 
 
 #include "wx/gtk1/private.h"
 
 


@@ -568,4 +572,3 @@ wxRect wxRegionIterator::GetRect() const
 
     return r;
 }
 
     return r;
 }

-

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index e472846bb0f1396264dd205c0fe1fe8ba750ef2d..36ac27ffd4695f56233bb5a3bbd307cedaa4dc42 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -14,10 +14,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index deb4a9251c837854c7ff51fb2e3d921b68b732a7..67d932e80af0ec6316a1fdb07eda6cb95209d1b6 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        thread.cpp
+// Name:        src/gtk1/thread.cpp

 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -13,9 +13,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"

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

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/log.h"

 
 wxMutex::wxMutex()
 {
 
 wxMutex::wxMutex()
 {

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 204b4e4663e86100322bbb4f2e76434a8616a033..914ad1ef3739cceea8dafb6425f590818c0054f9 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        threadsgi.cpp
+// Name:        src/gtk1/threadsgi.cpp

 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:
 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:


@@ -13,6 +13,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"

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

 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>
 


@@ -21,7 +26,6 @@
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include "wx/utils.h"
 #include <sys/prctl.h>
 #include "wx/module.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 460cae59ad6653a98a7e5a7eb370b7455c4ef315..414790ab21d23df08954be28a4bebd629b3b053e 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -23,7 +23,11 @@
 #endif
 
 #include "wx/toplevel.h"
 #endif
 
 #include "wx/toplevel.h"

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

 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp
index 91e52b964c6ee49a2cf36a473e7d1b32e2550355..325c74f345f78d8c2891071f901bff382d985230 100644 (file)
--- a/src/gtk1/treegtk.cpp
+++ b/src/gtk1/treegtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.cpp
+// Name:        src/gtk1/treectrl.cpp

 // Purpose:     wxTreeCtrl
 // Author:      Denis Pershin
 // Modified by:
 // Purpose:     wxTreeCtrl
 // Author:      Denis Pershin
 // Modified by:


@@ -13,16 +13,16 @@
 #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/wx.h"
+    #include "wx/wx.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/gtk1/treectrl.h"
 #include "wx/textctrl.h"
 #endif
 
 #include "wx/gtk1/treectrl.h"
 #include "wx/textctrl.h"

-#include "wx/log.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -186,16 +186,17 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList) {
   m_imageListState = imageList;
 }
 
   m_imageListState = imageList;
 }
 

-wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const {
-  char *t;
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const
+{
+    char *t;

 
 

-  if (!item.IsOk())
-    return wxString("");
+    if (!item.IsOk())
+        return wxEmptyString;

 
 

-  GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
-  gtk_label_get(l, &t);
+    GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
+    gtk_label_get(l, &t);

 
 

-  return t;
+    return t;

 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const {
 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const {

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index c9d478b4287716a97e77ab853016d6c53074ad7a..56fb435d13e05f7e435139ae4f3e60130af91be8 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -15,10 +15,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 1bd989f80bcc052a362806da547b4f6dd43ca608..b04e3af62e5f5d63279f983328f6b3022f1e1626 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/config.h"
 #include "wx/app.h"
 
 #include "wx/config.h"
 #include "wx/app.h"
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 0d8838061d67bfef122ffde3ccfa3181eae49efd..d5a37d77f816fb919e0bd5629b1f5ea24aa4eb29 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -49,7 +50,6 @@
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/settings.h"
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/settings.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 5acac76914c089d609987f16292e12342a7ac504..531b8a8fee0ef62841e7ae7bcf5547733386b740 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -31,7 +31,6 @@
 #include "wx/busyinfo.h"
 #include "wx/encconv.h"
 #include "wx/fontmap.h"
 #include "wx/busyinfo.h"
 #include "wx/encconv.h"
 #include "wx/fontmap.h"

-#include "wx/log.h"

 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"
 #include "wx/html/htmlfilt.h"
 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"
 #include "wx/html/htmlfilt.h"

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index a81f2c102319928943b2441b926190c7094ed15b..624356dcb3c9d591d65bf4fa1ed14e7025f99045 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -21,6 +21,7 @@
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
     #include "wx/dcmemory.h"
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
     #include "wx/dcmemory.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/html/forcelnk.h"
 #endif
 
 #include "wx/html/forcelnk.h"


@@ -29,7 +30,6 @@
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"

-#include "wx/log.h"

 #include "wx/artprov.h"
 #include "wx/math.h"
 
 #include "wx/artprov.h"
 #include "wx/math.h"
 

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index e702952b46752f0fe4b7d316939f6450ba2dd26b..97c4c92d40d4297ff7e464493c567761ef62216a 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -18,13 +18,13 @@
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/dc.h"
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/dc.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/html/htmldefs.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"
 #endif
 
 #include "wx/html/htmldefs.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"

-#include "wx/log.h"

 #include "wx/settings.h"
 #include "wx/uri.h"
 
 #include "wx/settings.h"
 #include "wx/uri.h"
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b7082817a01585c3745a04c101dba434c72344fe..8338c416182213a5704b643475e41d0cceacee70 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -15,6 +15,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -30,7 +31,6 @@
 #include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

-#include "wx/log.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 89f0d0e12705f8df38b77f9e84c97e90f88ac565..2d354a3f2aef65c0527cd22ab5424a21de7abbc7 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/mac/carbon/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      Stefan Csomor
 // Modified by:


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

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

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/log.h"

 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"
 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"

diff --git a/src/mac/carbon/cfsocket.cpp b/src/mac/carbon/cfsocket.cpp
index d99f05a0124359d92a86a32d5c8b09067aac89c8..531c538a347cbe7985fe94e48a90925348d1b4fa 100644 (file)
--- a/src/mac/carbon/cfsocket.cpp
+++ b/src/mac/carbon/cfsocket.cpp
@@ -23,6 +23,7 @@
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -30,7 +31,6 @@
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"

-#include "wx/log.h"

 #include "wx/event.h"
 
 #include "wx/sckaddr.h"
 #include "wx/event.h"
 
 #include "wx/sckaddr.h"

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index f884aae4f7868c7ffb5d23d9ecf0ab68531e11dc..c5f05871f09a4f30be213ec166c0baaf1d187b16 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -18,6 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -25,7 +26,6 @@
 #include "wx/bitmap.h"
 #include "wx/utils.h"
 #include "wx/metafile.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"
 #include "wx/metafile.h"

-#include "wx/log.h"

 
 #ifndef __DARWIN__
 #include <Scrap.h>
 
 #ifndef __DARWIN__
 #include <Scrap.h>

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index f572edfe5541878b452aae3ba3c309c025330534..3ace48bcd887bb711732dc9b674174a21e2e094b 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/dcmemory.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index b3e3ef106a781582d8546590d4f8e15f472e80ff..46d1b080b62473f62a5ab4974161c9329121fa4d 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/mac/carbon/dc.cpp

 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:


@@ -14,13 +14,17 @@
 #include "wx/dc.h"
 
 #if !wxMAC_USE_CORE_GRAPHICS
 #include "wx/dc.h"
 
 #if !wxMAC_USE_CORE_GRAPHICS

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

 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"

-#include "wx/log.h"

 
 #ifdef __MSL__
     #if __MSL__ >= 0x6000
 
 #ifdef __MSL__
     #if __MSL__ >= 0x6000


@@ -1008,7 +1012,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[],
 
     if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
         return ;
 
     if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
         return ;

-    
+

     wxMacFastPortSetter helper(this) ;
 
     wxCoord x1, x2 , y1 , y2 ;
     wxMacFastPortSetter helper(this) ;
 
     wxCoord x1, x2 , y1 , y2 ;


@@ -1147,7 +1151,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     // CMB: draw nothing if transformed w or h is 0
     if (ww == 0 || hh == 0)
         return;
     // CMB: draw nothing if transformed w or h is 0
     if (ww == 0 || hh == 0)
         return;

-    
+

     // CMB: handle -ve width and/or height
     if (ww < 0)
     {
     // CMB: handle -ve width and/or height
     if (ww < 0)
     {


@@ -1473,7 +1477,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     // TODO: support text background color (only possible by hand, ATSUI does not support it)
     wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText - invalid DC") );
 
     // TODO: support text background color (only possible by hand, ATSUI does not support it)
     wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText - invalid DC") );
 

-    if ( str.Length() == 0 )
+    if ( str.empty() )

         return ;
 
     wxMacFastPortSetter helper(this) ;
         return ;
 
     wxMacFastPortSetter helper(this) ;


@@ -1490,7 +1494,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4
     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4


@@ -1734,9 +1738,9 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoGetPartialTextExtents - invalid DC"));
 
     widths.Empty();
     wxCHECK_MSG(Ok(), false, wxT("wxDC::DoGetPartialTextExtents - invalid DC"));
 
     widths.Empty();

-    widths.Add(0, text.Length());
+    widths.Add(0, text.length());

 
 

-    if (text.Length() == 0)
+    if (text.length() == 0)

         return false;
 
     wxMacFastPortSetter helper(this) ;
         return false;
 
     wxMacFastPortSetter helper(this) ;


@@ -1754,7 +1758,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
         // fonts, please change it.  Currently it is measuring from the
         // beginning of the string for each succeeding substring, which is much
         // slower than this should be.
         // fonts, please change it.  Currently it is measuring from the
         // beginning of the string for each succeeding substring, which is much
         // slower than this should be.

-        for (size_t i=0; i<text.Length(); i++)
+        for (size_t i=0; i<text.length(); i++)

         {
             wxString str(text.Left(i + 1));
             Point bounds = {0, 0};
         {
             wxString str(text.Left(i + 1));
             Point bounds = {0, 0};


@@ -1781,7 +1785,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
         // Copy to widths, starting at measurements[1]
         // NOTE: this doesn't take into account any multi-byte characters
         // in buff, it probably should...
         // Copy to widths, starting at measurements[1]
         // NOTE: this doesn't take into account any multi-byte characters
         // in buff, it probably should...

-        for (size_t i=0; i<text.Length(); i++)
+        for (size_t i=0; i<text.length(); i++)

             widths[i] = XDEV2LOGREL(measurements[i + 1]);
 
         delete [] measurements;
             widths[i] = XDEV2LOGREL(measurements[i + 1]);
 
         delete [] measurements;


@@ -2162,13 +2166,13 @@ void wxDC::MacInstallBrush() const
                     Pattern whiteColor ;
                     ::BackPat(GetQDGlobalsWhite(&whiteColor));
                     ::SetThemePen( m_brush.MacGetTheme() , wxDisplayDepth() , true ) ;
                     Pattern whiteColor ;
                     ::BackPat(GetQDGlobalsWhite(&whiteColor));
                     ::SetThemePen( m_brush.MacGetTheme() , wxDisplayDepth() , true ) ;

-                }   
+                }

             break ;
             break ;

-        
+

             default :
                 ::PenPat(GetQDGlobalsBlack(&blackColor));
                 break ;
             default :
                 ::PenPat(GetQDGlobalsBlack(&blackColor));
                 break ;

-                
+

         }
     }
     else if (m_brush.IsHatch())
         }
     }
     else if (m_brush.IsHatch())

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index 5512b97eac379bc6b468ec9effefe17487b1671c..7557864d65825246c76308e3753d6b76ad93ed72 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/mac/carbon/dccg.cpp

 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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


@@ -15,13 +15,16 @@
 
 #if wxMAC_USE_CORE_GRAPHICS
 
 
 #if wxMAC_USE_CORE_GRAPHICS
 

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

 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"

-#include "wx/log.h"

 
 
 #ifdef __MSL__
 
 
 #ifdef __MSL__


@@ -1720,14 +1723,14 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") );
     wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") );
 
     wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") );
     wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") );
 

-    if ( str.Length() == 0 )
+    if ( str.length() == 0 )

         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
         return ;
     if ( m_logicalFunction != wxCOPY )
         return ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4
     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4


@@ -1885,14 +1888,14 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height
         MacInstallFont() ;
     }
 
         MacInstallFont() ;
     }
 

-    if ( str.Length() == 0 )
+    if ( str.empty() )

         return ;
 
     wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
         return ;
 
     wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ;
 
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4
     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4


@@ -1957,13 +1960,13 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") );
 
     widths.Empty();
     wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") );
 
     widths.Empty();

-    widths.Add(0, text.Length());
+    widths.Add(0, text.length());

 
 

-    if (text.Length() == 0)
+    if (text.empty())

         return false;
 
     ATSUTextLayout atsuLayout ;
         return false;
 
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = text.Length() ;
+    UniCharCount chars = text.length() ;

     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4
     UniChar* ubuf = NULL ;
 
 #if SIZEOF_WCHAR_T == 4


@@ -2198,4 +2201,3 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 }
 
 #endif // wxMAC_USE_CORE_GRAPHICS
 }
 
 #endif // wxMAC_USE_CORE_GRAPHICS

-

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 7f14f9b53adbd3aa6b6e521a95c4fe026f82c961..24e5d95e30e9234b734082559f5b3dc67c3dc2da 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -1,17 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/mac/carbon/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxClientDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

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

 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"


@@ -19,7 +24,6 @@
 #include "wx/settings.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
 #include "wx/settings.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"

-#include "wx/log.h"

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


@@ -42,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-    
+

 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {
 
 static wxBrush MacGetBackgroundBrush( wxWindow* window )
 {


@@ -83,11 +87,11 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;
                 extent.top-- ;
                 extent.right = x + size.x ;
                 extent.bottom = y + size.y ;

-                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; 
+                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ;

                 break ;
             }
                 break ;
             }

-            
-            parent = parent->GetParent() ;  
+
+            parent = parent->GetParent() ;

         }
     }
 
         }
     }
 


@@ -99,14 +103,14 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
 #endif
 
     return bkdBrush ;
 #endif
 
     return bkdBrush ;

-}    
+}

 
 

-wxWindowDC::wxWindowDC() 
+wxWindowDC::wxWindowDC()

 {
     m_window = NULL ;
 }
 
 {
     m_window = NULL ;
 }
 

-wxWindowDC::wxWindowDC(wxWindow *window) 
+wxWindowDC::wxWindowDC(wxWindow *window)

 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
 {
     m_window = window ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;


@@ -137,7 +141,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         // situations
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         // situations
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;

-        
+

         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index 043439c64fa0aadbab5b4f2cc923b342c2fa6f58..fe90214386947d784a1db4db81e971da2a74772c 100644 (file)
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -23,11 +23,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/cmndata.h"
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/cmndata.h"
 #include "wx/fontutil.h"

-#include "wx/log.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index e64e4c01e3895e134792620fd4f8ac11f16dde7a..f5e7c59eb0cfef51ae5e015b444a85b098f19eaa 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -1,30 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.cpp
+// Name:        src/mac/carbon/glcanvas.cpp

 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GLCANVAS
 
 #endif
 
 #if wxUSE_GLCANVAS
 

+#include "wx/glcanvas.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

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

-#include "wx/log.h"

 
 

-#include "wx/glcanvas.h"

 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:
 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:


@@ -42,12 +43,12 @@ wxGLContext::wxGLContext(
                          )
 {
     m_window = win;
                          )
 {
     m_window = win;

-    
+

     m_drawable = (AGLDrawable) UMAGetWindowPort(MAC_WXHWND(win->MacGetTopLevelWindowRef()));
     m_drawable = (AGLDrawable) UMAGetWindowPort(MAC_WXHWND(win->MacGetTopLevelWindowRef()));

-    
+

     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );

-    
+

     GLboolean b;
     b = aglSetDrawable(m_glContext, m_drawable);
     wxCHECK_RET( b, wxT("Couldn't bind OpenGl context") );
     GLboolean b;
     b = aglSetDrawable(m_glContext, m_drawable);
     wxCHECK_RET( b, wxT("Couldn't bind OpenGl context") );


@@ -145,14 +146,14 @@ wxGLCanvas::~wxGLCanvas()
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)
 {
     GLint data[512];
 static AGLPixelFormat ChoosePixelFormat(const int *attribList)
 {
     GLint data[512];

-    GLint defaultAttribs[] = { AGL_RGBA, 
-        AGL_DOUBLEBUFFER, 
-        AGL_MINIMUM_POLICY, 
+    GLint defaultAttribs[] = { AGL_RGBA,
+        AGL_DOUBLEBUFFER,
+        AGL_MINIMUM_POLICY,

         AGL_DEPTH_SIZE, 1,  // use largest available depth buffer
         AGL_DEPTH_SIZE, 1,  // use largest available depth buffer

-        AGL_RED_SIZE, 1, 
-        AGL_GREEN_SIZE, 1, 
-        AGL_BLUE_SIZE, 1, 
-        AGL_ALPHA_SIZE, 0, 
+        AGL_RED_SIZE, 1,
+        AGL_GREEN_SIZE, 1,
+        AGL_BLUE_SIZE, 1,
+        AGL_ALPHA_SIZE, 0,

         AGL_NONE };
     GLint *attribs;
     if (!attribList)
         AGL_NONE };
     GLint *attribs;
     if (!attribList)


@@ -162,7 +163,7 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
     else
     {
         int arg=0, p=0;
     else
     {
         int arg=0, p=0;

-        
+

         data[p++] = AGL_MINIMUM_POLICY; // make _SIZE tags behave more like GLX
         while( (attribList[arg]!=0) && (p<512) )
         {
         data[p++] = AGL_MINIMUM_POLICY; // make _SIZE tags behave more like GLX
         while( (attribList[arg]!=0) && (p<512) )
         {


@@ -185,9 +186,9 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
                 data[p++]=AGL_BLUE_SIZE; data[p++]=attribList[arg++]; break;
             case WX_GL_MIN_ALPHA:
                 data[p++]=AGL_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
                 data[p++]=AGL_BLUE_SIZE; data[p++]=attribList[arg++]; break;
             case WX_GL_MIN_ALPHA:
                 data[p++]=AGL_ALPHA_SIZE; data[p++]=attribList[arg++]; break;

-            case WX_GL_DEPTH_SIZE: 
+            case WX_GL_DEPTH_SIZE:

                 data[p++]=AGL_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
                 data[p++]=AGL_DEPTH_SIZE; data[p++]=attribList[arg++]; break;

-            case WX_GL_STENCIL_SIZE: 
+            case WX_GL_STENCIL_SIZE:

                 data[p++]=AGL_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
             case WX_GL_MIN_ACCUM_RED:
                 data[p++]=AGL_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;
                 data[p++]=AGL_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
             case WX_GL_MIN_ACCUM_RED:
                 data[p++]=AGL_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;


@@ -200,12 +201,12 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
             default:
                 break;
             }
             default:
                 break;
             }

-        }       
-        data[p] = 0; 
-        
+        }
+        data[p] = 0;
+

         attribs = data;
     }
         attribs = data;
     }

-    
+

     return aglChoosePixelFormat(NULL, 0, attribs);
 }
 
     return aglChoosePixelFormat(NULL, 0, attribs);
 }
 


@@ -216,14 +217,14 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
     m_macCanvasIsShown = false ;
     m_glContext = 0 ;
     wxWindow::Create( parent, id, pos, size, style, name );
     m_macCanvasIsShown = false ;
     m_glContext = 0 ;
     wxWindow::Create( parent, id, pos, size, style, name );

-    
+

     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );

-    
+

     m_glContext = new wxGLContext(fmt, this, palette, shared);
     m_macCanvasIsShown = true ;
     aglDestroyPixelFormat(fmt);
     m_glContext = new wxGLContext(fmt, this, palette, shared);
     m_macCanvasIsShown = true ;
     aglDestroyPixelFormat(fmt);

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -245,30 +246,30 @@ void wxGLCanvas::SetViewport()
     // adjust glViewport to just this window
     int x = 0 ;
     int y = 0 ;
     // adjust glViewport to just this window
     int x = 0 ;
     int y = 0 ;

-    
+

     wxWindow* iter = this ;
     while( iter->GetParent() )
     {
     wxWindow* iter = this ;
     while( iter->GetParent() )
     {

-       iter = iter->GetParent() ;
+        iter = iter->GetParent() ;

     }
     }

-    
+

     if ( iter && iter->IsTopLevel() )
     {
     if ( iter && iter->IsTopLevel() )
     {

-           MacClientToRootWindow( &x , &y ) ;
-           int width, height;
-           GetClientSize(& width, & height);
-           Rect bounds ;
-           GetWindowPortBounds( MAC_WXHWND(MacGetTopLevelWindowRef()) , &bounds ) ;
-           GLint parms[4] ;
-           parms[0] = x ;
-           parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
-           parms[2] = width ;
-           parms[3] = height ;
-           
-           if ( !m_macCanvasIsShown )
-               parms[0] += 20000 ;
-           aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
-       }
+        MacClientToRootWindow( &x , &y ) ;
+        int width, height;
+        GetClientSize(& width, & height);
+        Rect bounds ;
+        GetWindowPortBounds( MAC_WXHWND(MacGetTopLevelWindowRef()) , &bounds ) ;
+        GLint parms[4] ;
+        parms[0] = x ;
+        parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
+        parms[2] = width ;
+        parms[3] = height ;
+
+        if ( !m_macCanvasIsShown )
+            parms[0] += 20000 ;
+        aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
+   }

 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)


@@ -312,11 +313,11 @@ void wxGLCanvas::SetColour(const wxChar *colour)
         m_glContext->SetColour(colour);
 }
 
         m_glContext->SetColour(colour);
 }
 

-bool wxGLCanvas::Show(bool show) 
+bool wxGLCanvas::Show(bool show)

 {
     if ( !wxWindow::Show( show ) )
         return FALSE ;
 {
     if ( !wxWindow::Show( show ) )
         return FALSE ;

-/*        
+/*

     if ( !show )
     {
         if ( m_macCanvasIsShown )
     if ( !show )
     {
         if ( m_macCanvasIsShown )


@@ -337,7 +338,7 @@ bool wxGLCanvas::Show(bool show)
     return TRUE ;
 }
 
     return TRUE ;
 }
 

-void wxGLCanvas::MacVisibilityChanged() 
+void wxGLCanvas::MacVisibilityChanged()

 {
     if ( !MacIsReallyShown() )
     {
 {
     if ( !MacIsReallyShown() )
     {

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 3d6eac95daaecba9e9f15dcbe3d2a6e99b1e768d..ace8cfff04f0683a39e0dde081e7a4233deef785 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,16 +13,17 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

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

-#include "wx/listbox.h"

 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"

-#include "wx/log.h"

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

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 931f25c3fd544a16f00454e77c44100e048c3522..b73db78b200dc56f8416b4b030ac412099022f64 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.cpp
+// Name:        src/mac/carbon/menu.cpp

 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


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

-#include "wx/app.h"

 #include "wx/menu.h"
 #include "wx/menu.h"

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

 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/log.h"
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/log.h"


@@ -198,7 +203,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                 UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos);
                 pos += 1 ;
             }
                 UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos);
                 pos += 1 ;
             }

-            
+

             SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , wxIdToMacCommand ( pItem->GetId() ) ) ;
             SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ;
             pItem->UpdateItemText() ;
             SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , wxIdToMacCommand ( pItem->GetId() ) ) ;
             SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ;
             pItem->UpdateItemText() ;

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index f157c63c3ce3a25284f677f55f0200da7fae1caa..173f3d5f55a95393f95e53a8351b99bcc5add152 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -38,13 +38,13 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif
 
 
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/confbase.h"
 
 #include "wx/file.h"
 #include "wx/confbase.h"
 

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 26decfafb24c22c97052d55631b757573e19504f..a14cbd6f7fd11f0867c7982403d6eee4d8d2c0ee 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -17,11 +17,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/app.h"
 #include "wx/string.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/string.h"

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/image.h"
 #include "wx/mac/uma.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index 01c41c4b50d310110ff2fac345dd50516a629334..c04f765f72cf051d091013aa114244cdbedc7611 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -20,9 +20,9 @@
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/object.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/timer.h"
 
 #include "wx/file.h"
 #include "wx/timer.h"
 

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 46f90f87320d5e65c62d4f06650e5bdaf33e7c9f..e2d732fab8b93be47ba8928e8b34d14563c17c15 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -11,8 +11,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/menu.h"

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

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/menu.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"


@@ -30,7 +35,6 @@
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"

-#include "wx/log.h"

 #include "wx/geometry.h"
 #include "wx/textctrl.h"
 
 #include "wx/geometry.h"
 #include "wx/textctrl.h"
 


@@ -514,7 +518,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
 
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
 
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;

-               charBuf[ numChars - 1 ] = 0;
+        charBuf[ numChars - 1 ] = 0;

 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
         memcpy( uniChars , charBuf , numChars * 2 ) ;
 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
         memcpy( uniChars , charBuf , numChars * 2 ) ;

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index a0c258957165f077298cb80a5b56fa1eb7b76e4a..bbce9ec7698471df75c539788ce0a756ad190109 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -19,6 +19,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -34,7 +35,6 @@
 #include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

-#include "wx/log.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index 952bb1101a7674a1ac6e401a3bbbd63480486557..d91980f7f8f1f7813933faf55e9f1687f5da2e15 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -16,8 +16,12 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

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

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/log.h"

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


@@ -1433,4 +1437,3 @@ void wxBitmap::UseAlpha()
     // mask in UngetRawData()
     M_BITMAPDATA->m_hasAlpha = true;
 }
     // mask in UngetRawData()
     M_BITMAPDATA->m_hasAlpha = true;
 }

-

diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index 146534dfd25a79e49426b4c059af6e0a4ba3caf2..a413f827a77f6c5a2d9893ec89060e501f5d4fb6 100644 (file)
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -15,6 +15,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -22,7 +23,6 @@
 #include "wx/bitmap.h"
 #include "wx/utils.h"
 #include "wx/metafile.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"
 #include "wx/metafile.h"

-#include "wx/log.h"

 
 #ifndef __DARWIN__
 #include <Scrap.h>
 
 #ifndef __DARWIN__
 #include <Scrap.h>

diff --git a/src/mac/classic/dataobj.cpp b/src/mac/classic/dataobj.cpp
index 1e2bd14fd452143aea01750d57299ebe168441ca..0c26a14a5b8f2dac9656c468cfd0c0bedb666a0e 100644 (file)
--- a/src/mac/classic/dataobj.cpp
+++ b/src/mac/classic/dataobj.cpp
@@ -25,9 +25,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

diff --git a/src/mac/classic/dc.cpp b/src/mac/classic/dc.cpp
index 733afcaa0fbd2d7be7fe52c90d82b5a0382e313e..57d4a7a48f6f8b48ebd0cdcd7e63898975e351a0 100644 (file)
--- a/src/mac/classic/dc.cpp
+++ b/src/mac/classic/dc.cpp
@@ -1,22 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/mac/classic/dc.cpp

 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+

 #include "wx/dc.h"
 #include "wx/dc.h"

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

 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 #include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"

-#include "wx/log.h"

 
 #if __MSL__ >= 0x6000
 namespace std {}
 
 #if __MSL__ >= 0x6000
 namespace std {}


@@ -1349,7 +1355,7 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
         return;
     }
 
         return;
     }
 

-    if ( str.Length() == 0 )
+    if ( str.length() == 0 )

         return ;
 
     wxMacFastPortSetter helper(this) ;
         return ;
 
     wxMacFastPortSetter helper(this) ;


@@ -1363,9 +1369,9 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     }
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;
     }
     OSStatus status = noErr ;
     ATSUTextLayout atsuLayout ;

-    UniCharCount chars = str.Length() ;
+    UniCharCount chars = str.length() ;

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) (const wxChar*) str , 0 , str.Length() , str.Length() , 1 ,
+    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) (const wxChar*) str , 0 , str.length() , str.length() , 1 ,

         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 #else
     wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;
         &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
 #else
     wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;


@@ -1454,7 +1460,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
     {
         ::TextMode( srcCopy ) ;
     }
     {
         ::TextMode( srcCopy ) ;
     }

-    int length = strtext.Length() ;
+    int length = strtext.length() ;

 
     int laststop = 0 ;
     int i = 0 ;
 
     int laststop = 0 ;
     int i = 0 ;


@@ -1604,7 +1610,7 @@ void  wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h
         *descent =YDEV2LOGREL( fi.descent );
     if ( externalLeading )
         *externalLeading = YDEV2LOGREL( fi.leading ) ;
         *descent =YDEV2LOGREL( fi.descent );
     if ( externalLeading )
         *externalLeading = YDEV2LOGREL( fi.leading ) ;

-    int length = strtext.Length() ;
+    int length = strtext.length() ;

 
     int laststop = 0 ;
     int i = 0 ;
 
     int laststop = 0 ;
     int i = 0 ;


@@ -1687,9 +1693,9 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
 
     widths.Empty();
     wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
 
     widths.Empty();

-    widths.Add(0, text.Length());
+    widths.Add(0, text.length());

 
 

-    if (text.Length() == 0)
+    if (text.length() == 0)

         return false;
 
     wxMacFastPortSetter helper(this) ;
         return false;
 
     wxMacFastPortSetter helper(this) ;


@@ -1706,7 +1712,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
         // fonts, please change it.  Currently it is measuring from the
         // begining of the string for each succeding substring, which is much
         // slower than this should be.
         // fonts, please change it.  Currently it is measuring from the
         // begining of the string for each succeding substring, which is much
         // slower than this should be.

-        for (size_t i=0; i<text.Length(); i++)
+        for (size_t i=0; i<text.length(); i++)

         {
             wxString str(text.Left(i+1));
             Point bounds = {0,0};
         {
             wxString str(text.Left(i+1));
             Point bounds = {0,0};


@@ -1732,7 +1738,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
         // Copy to widths, starting at measurements[1]
         // NOTE: this doesn't take into account any multi-byte characters
         // in buff, it probabkly should...
         // Copy to widths, starting at measurements[1]
         // NOTE: this doesn't take into account any multi-byte characters
         // in buff, it probabkly should...

-        for (size_t i=0; i<text.Length(); i++)
+        for (size_t i=0; i<text.length(); i++)

             widths[i] = XDEV2LOGREL(measurements[i+1]);
 
         delete [] measurements;
             widths[i] = XDEV2LOGREL(measurements[i+1]);
 
         delete [] measurements;

diff --git a/src/mac/classic/glcanvas.cpp b/src/mac/classic/glcanvas.cpp
index bd326659bda35b4724030949c5ea7008ee699322..e7e8c3f4abd6a6ae71c10996da25d16ba186d0d4 100644 (file)
--- a/src/mac/classic/glcanvas.cpp
+++ b/src/mac/classic/glcanvas.cpp
@@ -6,25 +6,26 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GLCANVAS
 
 #endif
 
 #if wxUSE_GLCANVAS
 

+#include "wx/glcanvas.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

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

-#include "wx/log.h"

 
 

-#include "wx/glcanvas.h"

 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:
 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 0289796b703c80ab638be5f28f5c0d5a4340ed9e..f194f47c6986f3b379e9a57ff7b6d53eb93e194f 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -13,16 +13,17 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

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

-#include "wx/listbox.h"

 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"

-#include "wx/log.h"

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

diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index dae283d79f55ce985c94451a75d5b1b23b1ca302..2603ac21dde66ab5faa6dae72017bd12ec13c3d4 100644 (file)
--- a/src/mac/classic/mdi.cpp
+++ b/src/mac/classic/mdi.cpp
@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/mac/classic/mdi.cpp

 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+

 #include "wx/mdi.h"
 #include "wx/mdi.h"

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

 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/menu.h"
 #include "wx/settings.h"

-#include "wx/log.h"

 
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"


@@ -67,7 +73,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;

-    
+

     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu
     if ( style & wxFRAME_NO_WINDOW_MENU )
     // this style can be used to prevent a window from having the standard MDI
     // "Window" menu
     if ( style & wxFRAME_NO_WINDOW_MENU )


@@ -78,7 +84,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     else // normal case: we have the window menu, so construct it
     {
         m_windowMenu = new wxMenu;
     else // normal case: we have the window menu, so construct it
     {
         m_windowMenu = new wxMenu;

-        
+

         m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
         m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
         m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));
         m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
         m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
         m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));


@@ -86,12 +92,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
         m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }

-    
+

     wxFrame::Create( parent , id , title , pos , size , style , name ) ;
     m_parentFrameActive = TRUE;
     wxFrame::Create( parent , id , title , pos , size , style , name ) ;
     m_parentFrameActive = TRUE;

-    
+

     OnCreateClient();
     OnCreateClient();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -104,15 +110,15 @@ wxMDIParentFrame::~wxMDIParentFrame()
 #endif
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;

-#endif    
+#endif

     m_clientWindow = NULL ;
     m_clientWindow = NULL ;

-    
+

     if (m_windowMenu)
     {
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }
     if (m_windowMenu)
     {
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }

-    
+

     if ( m_clientWindow )
     {
         delete m_clientWindow;
     if ( m_clientWindow )
     {
         delete m_clientWindow;


@@ -195,7 +201,7 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO

-    
+

     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }
     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }


@@ -245,19 +251,19 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
     SetName(name);
                              const wxString& name)
 {
     SetName(name);

-    
+

     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();

-    
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;

-    
+

     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

-    
+

     wxModelessWindows.Append(this);
     return FALSE;
 }
     wxModelessWindows.Append(this);
     return FALSE;
 }


@@ -275,7 +281,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 #endif
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;

-#endif    
+#endif

 }
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 }
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)


@@ -299,7 +305,7 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
         }
         else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow)
             mdiparent->wxFrame::MacActivate(timestamp,activating);
         }
         else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow)
             mdiparent->wxFrame::MacActivate(timestamp,activating);

-        
+

         if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this)
             mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false);
         mdiparent->m_currentChild = this;
         if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this)
             mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false);
         mdiparent->m_currentChild = this;


@@ -362,15 +368,15 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {

-    
+

     m_windowId = (int)NewControlId();
     m_windowId = (int)NewControlId();

-    
+

     if ( parent )
     {
         parent->AddChild(this);
     }
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     if ( parent )
     {
         parent->AddChild(this);
     }
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);

-    
+

     wxModelessWindows.Append(this);
     return TRUE;
 }
     wxModelessWindows.Append(this);
     return TRUE;
 }


@@ -385,4 +391,3 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 }
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 }

-

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index ab63be2f36536057ca2fa52932e7f3a6f3dcc805..8e4c0163c6a1e228bbba312776333603358f75ce 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.cpp
+// Name:        src/mac/classic/menu.cpp

 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -16,11 +16,17 @@
 // wxWidgets headers
 // -----------------
 
 // wxWidgets headers
 // -----------------
 

-#include "wx/app.h"
+#include "wx/wxprec.h"
+

 #include "wx/menu.h"
 #include "wx/menu.h"

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

 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/menuitem.h"
 #include "wx/window.h"

-#include "wx/log.h"

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


@@ -71,7 +77,7 @@ void wxMenu::Init()
     }
 
     // if we have a title, insert it in the beginning of the menu
     }
 
     // if we have a title, insert it in the beginning of the menu

-    if ( !!m_title )
+    if ( !m_title.empty() )

     {
         Append(idMenuTitle, m_title) ;
         AppendSeparator() ;
     {
         Append(idMenuTitle, m_title) ;
         AppendSeparator() ;


@@ -870,5 +876,3 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
 
     return item;
 }
 
     return item;
 }

-
-

diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp
index fa8a5fc51b766784fa1d4bc44cd5dd7151099f9e..6636261d9a394862a473806fabc9ce54d6d4f994 100644 (file)
--- a/src/mac/classic/mimetmac.cpp
+++ b/src/mac/classic/mimetmac.cpp
@@ -22,13 +22,13 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif //WX_PRECOMP
 
 
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif //WX_PRECOMP
 
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/confbase.h"
 
 #include "wx/file.h"
 #include "wx/confbase.h"
 

diff --git a/src/mac/classic/notebmac.cpp b/src/mac/classic/notebmac.cpp
index 02c1dd550103076d10635ab4df86700eef6d4c90..ed9c0cf22fdd94bbdab278b514a23a8649aaaa10 100644 (file)
--- a/src/mac/classic/notebmac.cpp
+++ b/src/mac/classic/notebmac.cpp
@@ -23,10 +23,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/image.h"
 #include "wx/mac/uma.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/utilsexc.cpp b/src/mac/classic/utilsexc.cpp
index d6d411d0466c8be4b3a3b1bdf43c549dbfd0ecf1..0645d04a5fe7c3cad560bcf73f0a34d5dd379d1a 100644 (file)
--- a/src/mac/classic/utilsexc.cpp
+++ b/src/mac/classic/utilsexc.cpp
@@ -1,16 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilsexec.cpp
+// Name:        src/mac/classic/utilsexec.cpp

 // Purpose:     Execution-related utilities
 // Author:      Stefan Csomor
 // Modified by: David Elliott
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     Execution-related utilities
 // Author:      Stefan Csomor
 // Modified by: David Elliott
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

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

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

 #ifdef __DARWIN__
 #include "wx/unix/execute.h"
 #include <unistd.h>
 #ifdef __DARWIN__
 #include "wx/unix/execute.h"
 #include <unistd.h>


@@ -133,20 +139,20 @@ long wxExecute(const wxString& command, int flags, wxProcess *WXUNUSED(handler))
 #ifdef __DARWIN__
 void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
 {
 #ifdef __DARWIN__
 void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
 {

-       wxEndProcessData *proc_data = (wxEndProcessData*)data;
-       wxLogDebug(wxT("Wow.. this actually worked!"));
-       int status = 0;
-       int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
-       if(!rc)
-       {
-               wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
-               return;
-       }
-       if((rc != -1) && WIFEXITED(status))
-               proc_data->exitcode = WEXITSTATUS(status);
-       else
-               proc_data->exitcode = -1;
-       wxHandleProcessTermination(proc_data);
+    wxEndProcessData *proc_data = (wxEndProcessData*)data;
+    wxLogDebug(wxT("Wow.. this actually worked!"));
+    int status = 0;
+    int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
+    if(!rc)
+    {
+        wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
+        return;
+    }
+    if((rc != -1) && WIFEXITED(status))
+        proc_data->exitcode = WEXITSTATUS(status);
+    else
+        proc_data->exitcode = -1;
+    wxHandleProcessTermination(proc_data);

 }
 
 int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
 }
 
 int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)


@@ -208,7 +214,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
         wxLogDebug(wxT("Couldn't create runloopsource"));
         return -1;
     }
         wxLogDebug(wxT("Couldn't create runloopsource"));
         return -1;
     }

-    
+

     CFRelease(CFMachPortForProcess);
 
     CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
     CFRelease(CFMachPortForProcess);
 
     CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index e067f9975a5bbf896844af1098e8d1836d3f90c9..86acdb173ed9eae79160ef1f06fd5fc50055b1f8 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -11,8 +11,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/menu.h"

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

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/menu.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"


@@ -33,7 +38,6 @@
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"

-#include "wx/log.h"

 #include "wx/geometry.h"
 
 #if wxUSE_CARET
 #include "wx/geometry.h"
 
 #if wxUSE_CARET

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index e4577b1c98ec36cab3c21295d023109235355ce9..e052ab50636bc239f8eb2ae29cf26a3bc76fcbd7 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -32,9 +32,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/mac/corefoundation/cfstring.h"
 
 #include "wx/utils.h"
 #include "wx/mac/corefoundation/cfstring.h"
 
 #include "wx/utils.h"

diff --git a/src/mac/corefoundation/hidjoystick.cpp b/src/mac/corefoundation/hidjoystick.cpp
index 7b42508e18b65e06f10844ab9a19a81e5933b72d..d3017da77cf6b320d76fe293e990b23670f59d43 100644 (file)
--- a/src/mac/corefoundation/hidjoystick.cpp
+++ b/src/mac/corefoundation/hidjoystick.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.cpp
+// Name:        src/mac/corefoundation/joystick.cpp

 // Purpose:     wxJoystick class
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2/13/2005
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Purpose:     wxJoystick class
 // Author:      Ryan Norton
 // Modified by:
 // Created:     2/13/2005
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 //===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 //===========================================================================


@@ -30,8 +30,12 @@
 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------

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

 #include "wx/event.h"       //joystick wxEvents
 #include "wx/event.h"       //joystick wxEvents

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

 #include "wx/joystick.h"    //...
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
 #include "wx/window.h"      //for wxWindow to "capture" joystick
 #include "wx/joystick.h"    //...
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
 #include "wx/window.h"      //for wxWindow to "capture" joystick


@@ -52,7 +56,7 @@
 #define wxJS_MAX_AXES       10 /*max number of axes*/
 #define wxJS_MAX_BUTTONS    40 /*max number of buttons*/
 
 #define wxJS_MAX_AXES       10 /*max number of axes*/
 #define wxJS_MAX_BUTTONS    40 /*max number of buttons*/
 

-enum 
+enum

 {
     //These are positions within the cookie array
     //in wxHIDJoystick that the cookies that store the axis' are
 {
     //These are positions within the cookie array
     //in wxHIDJoystick that the cookies that store the axis' are


@@ -72,13 +76,13 @@ class wxHIDJoystick : public wxHIDDevice
 public:
     wxHIDJoystick();
     ~wxHIDJoystick();
 public:
     wxHIDJoystick();
     ~wxHIDJoystick();

-    
-       bool Create(int nWhich);
-       virtual void BuildCookies(CFArrayRef Array);
-       void MakeCookies(CFArrayRef Array);
+
+    bool Create(int nWhich);
+    virtual void BuildCookies(CFArrayRef Array);
+    void MakeCookies(CFArrayRef Array);

     IOHIDElementCookie* GetCookies();
     IOHIDQueueInterface** GetQueue();
     IOHIDElementCookie* GetCookies();
     IOHIDQueueInterface** GetQueue();

-    
+

     int  m_nXMax, m_nYMax, m_nZMax, m_nRudderMax, m_nUMax, m_nVMax,
          m_nXMin, m_nYMin, m_nZMin, m_nRudderMin, m_nUMin, m_nVMin;
 
     int  m_nXMax, m_nYMax, m_nZMax, m_nRudderMax, m_nUMax, m_nVMax,
          m_nXMin, m_nYMin, m_nZMin, m_nRudderMin, m_nUMin, m_nVMin;
 


@@ -94,7 +98,7 @@ public:
     wxJoystickThread(wxHIDJoystick* hid, int joystick);
     void* Entry();
     static void HIDCallback(void* target, IOReturn res, void* context, void* sender);
     wxJoystickThread(wxHIDJoystick* hid, int joystick);
     void* Entry();
     static void HIDCallback(void* target, IOReturn res, void* context, void* sender);

-    
+

 private:
     wxHIDJoystick*       m_hid;
     int       m_joystick;
 private:
     wxHIDJoystick*       m_hid;
     int       m_joystick;


@@ -119,9 +123,9 @@ private:
 void wxGetIntFromCFDictionary(CFTypeRef cfDict, CFStringRef key, int* pOut)
 {
         CFNumberGetValue(
 void wxGetIntFromCFDictionary(CFTypeRef cfDict, CFStringRef key, int* pOut)
 {
         CFNumberGetValue(

-          (CFNumberRef) CFDictionaryGetValue((CFDictionaryRef) cfDict, 
-                                              key), 
-                               kCFNumberIntType, pOut);
+          (CFNumberRef) CFDictionaryGetValue((CFDictionaryRef) cfDict,
+                                              key),
+                        kCFNumberIntType, pOut);

 }
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 }
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -161,7 +165,7 @@ wxJoystick::wxJoystick(int joystick)
 //---------------------------------------------------------------------------
 // wxJoystick Destructor
 //
 //---------------------------------------------------------------------------
 // wxJoystick Destructor
 //

-// Releases the capture of the thread, deletes it, and deletes 
+// Releases the capture of the thread, deletes it, and deletes

 // the native implementation.
 //---------------------------------------------------------------------------
 wxJoystick::~wxJoystick()
 // the native implementation.
 //---------------------------------------------------------------------------
 wxJoystick::~wxJoystick()


@@ -169,7 +173,7 @@ wxJoystick::~wxJoystick()
     ReleaseCapture();
     if (m_thread)
         m_thread->Delete();  // It's detached so it will delete itself
     ReleaseCapture();
     if (m_thread)
         m_thread->Delete();  // It's detached so it will delete itself

-        
+

     if (m_hid)
         delete m_hid;
 }
     if (m_hid)
         delete m_hid;
 }


@@ -178,7 +182,7 @@ wxJoystick::~wxJoystick()
 // wxJoystick::Get[XXX]Position
 //
 // Returns the value of an axis that was polled from the thread. In the
 // wxJoystick::Get[XXX]Position
 //
 // Returns the value of an axis that was polled from the thread. In the

-// case of GetPosition returns the X and Y values in a wxPoint 
+// case of GetPosition returns the X and Y values in a wxPoint

 //---------------------------------------------------------------------------
 wxPoint wxJoystick::GetPosition() const
 {
 //---------------------------------------------------------------------------
 wxPoint wxJoystick::GetPosition() const
 {


@@ -193,7 +197,7 @@ int wxJoystick::GetZPosition() const
     return 0;
 }
 int wxJoystick::GetRudderPosition() const
     return 0;
 }
 int wxJoystick::GetRudderPosition() const

-{      
+{

     if (m_thread)
         return m_thread->m_axe[wxJS_AXIS_RUDDER];
     return 0;
     if (m_thread)
         return m_thread->m_axe[wxJS_AXIS_RUDDER];
     return 0;


@@ -231,27 +235,35 @@ int wxJoystick::GetButtonState() const
 // if the native implementation doesn't exist (in constructor)
 //---------------------------------------------------------------------------
 bool wxJoystick::IsOk() const
 // if the native implementation doesn't exist (in constructor)
 //---------------------------------------------------------------------------
 bool wxJoystick::IsOk() const

-{      
-    return m_hid != NULL;      
+{
+    return m_hid != NULL;

 }
 }

-    
+

 //---------------------------------------------------------------------------
 // wxJoystick::Get[XXX](Id/Name)
 //
 // Simple accessors to the native HID implementation
 //---------------------------------------------------------------------------
 int wxJoystick::GetManufacturerId() const
 //---------------------------------------------------------------------------
 // wxJoystick::Get[XXX](Id/Name)
 //
 // Simple accessors to the native HID implementation
 //---------------------------------------------------------------------------
 int wxJoystick::GetManufacturerId() const

-{      return m_hid->m_nManufacturerId;                                }
+{
+    return m_hid->m_nManufacturerId;
+}
+

 int wxJoystick::GetProductId() const
 int wxJoystick::GetProductId() const

-{      return m_hid->m_nProductId;                             }
+{
+    return m_hid->m_nProductId;
+}
+

 wxString wxJoystick::GetProductName() const
 wxString wxJoystick::GetProductName() const

-{      return m_hid->m_szProductName;                          }
+{
+    return m_hid->m_szProductName;
+}

 
 //---------------------------------------------------------------------------
 // wxJoystick::GetNumberButtons
 // wxJoystick::GetNumberAxes
 //
 
 //---------------------------------------------------------------------------
 // wxJoystick::GetNumberButtons
 // wxJoystick::GetNumberAxes
 //

-// Queries the joystick for an active number of buttons/axes. 
+// Queries the joystick for an active number of buttons/axes.

 //
 // In the native HID implementation, the cookies:
 // 0-40     are the buttons of the joystick
 //
 // In the native HID implementation, the cookies:
 // 0-40     are the buttons of the joystick


@@ -262,25 +274,25 @@ wxString wxJoystick::GetProductName() const
 int wxJoystick::GetNumberButtons() const
 {
     int nCount = 0;
 int wxJoystick::GetNumberButtons() const
 {
     int nCount = 0;

-    
+

     for(int nIndex = 0; nIndex < 40; ++nIndex)
     {
         if(m_hid->HasElement(nIndex))
             ++nCount;
     }
     for(int nIndex = 0; nIndex < 40; ++nIndex)
     {
         if(m_hid->HasElement(nIndex))
             ++nCount;
     }

-    
+

     return nCount;
 }
 int wxJoystick::GetNumberAxes() const
 {
     int nCount = 0;
     return nCount;
 }
 int wxJoystick::GetNumberAxes() const
 {
     int nCount = 0;

-    
+

     for(int nIndex = 40; nIndex < 50; ++nIndex)
     {
         if(m_hid->HasElement(nIndex))
             ++nCount;
     }
     for(int nIndex = 40; nIndex < 50; ++nIndex)
     {
         if(m_hid->HasElement(nIndex))
             ++nCount;
     }

-    
+

     return nCount;
 }
 
     return nCount;
 }
 


@@ -292,10 +304,10 @@ int wxJoystick::GetNumberAxes() const
 // identifiers.
 //---------------------------------------------------------------------------
 int wxJoystick::GetNumberJoysticks()
 // identifiers.
 //---------------------------------------------------------------------------
 int wxJoystick::GetNumberJoysticks()

-{    
-    return 
+{
+    return

         wxHIDDevice::GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick) +
         wxHIDDevice::GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick) +

-        wxHIDDevice::GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);   
+        wxHIDDevice::GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -339,30 +351,64 @@ bool wxJoystick::ReleaseCapture()
 // axis doesn't exist.
 //---------------------------------------------------------------------------
 int wxJoystick::GetXMin() const
 // axis doesn't exist.
 //---------------------------------------------------------------------------
 int wxJoystick::GetXMin() const

-{      return m_hid->m_nXMin;  }
+{
+    return m_hid->m_nXMin;
+}
+

 int wxJoystick::GetYMin() const
 int wxJoystick::GetYMin() const

-{      return m_hid->m_nYMin;  }
+{
+    return m_hid->m_nYMin;
+}
+

 int wxJoystick::GetZMin() const
 int wxJoystick::GetZMin() const

-{      return m_hid->m_nZMin;  }
+{
+    return m_hid->m_nZMin;
+}
+

 int wxJoystick::GetRudderMin() const
 int wxJoystick::GetRudderMin() const

-{      return m_hid->m_nRudderMin;     }
+{
+    return m_hid->m_nRudderMin;
+}
+

 int wxJoystick::GetUMin() const
 int wxJoystick::GetUMin() const

-{      return m_hid->m_nUMin;  }
+{
+    return m_hid->m_nUMin;
+}
+

 int wxJoystick::GetVMin() const
 int wxJoystick::GetVMin() const

-{      return m_hid->m_nVMin;  }
+{
+    return m_hid->m_nVMin;
+}

 
 int wxJoystick::GetXMax() const
 
 int wxJoystick::GetXMax() const

-{      return m_hid->m_nXMax;  }
+{
+    return m_hid->m_nXMax;
+}
+

 int wxJoystick::GetYMax() const
 int wxJoystick::GetYMax() const

-{      return m_hid->m_nYMax;  }
+{
+    return m_hid->m_nYMax;
+}
+

 int wxJoystick::GetZMax() const
 int wxJoystick::GetZMax() const

-{      return m_hid->m_nZMax;  }
+{
+    return m_hid->m_nZMax;
+}
+

 int wxJoystick::GetRudderMax() const
 int wxJoystick::GetRudderMax() const

-{      return m_hid->m_nRudderMax;     }
+{
+    return m_hid->m_nRudderMax;
+}
+

 int wxJoystick::GetUMax() const
 int wxJoystick::GetUMax() const

-{      return m_hid->m_nUMax;  }
+{
+    return m_hid->m_nUMax;
+}
+

 int wxJoystick::GetVMax() const
 int wxJoystick::GetVMax() const

-{      return m_hid->m_nVMax;  }
+{
+    return m_hid->m_nVMax;
+}

 
 //---------------------------------------------------------------------------
 // wxJoystick::Get[XXX]
 
 //---------------------------------------------------------------------------
 // wxJoystick::Get[XXX]


@@ -371,13 +417,24 @@ int wxJoystick::GetVMax() const
 // what the linux port has.
 //---------------------------------------------------------------------------
 int wxJoystick::GetMaxButtons() const
 // what the linux port has.
 //---------------------------------------------------------------------------
 int wxJoystick::GetMaxButtons() const

-{      return wxJS_MAX_BUTTONS;        }
+{
+    return wxJS_MAX_BUTTONS;
+}
+

 int wxJoystick::GetMaxAxes() const
 int wxJoystick::GetMaxAxes() const

-{      return wxJS_MAX_AXES;   }
+{
+    return wxJS_MAX_AXES;
+}
+

 int wxJoystick::GetPollingMin() const
 int wxJoystick::GetPollingMin() const

-{      return 10;      }
+{
+    return 10;
+}
+

 int wxJoystick::GetPollingMax() const
 int wxJoystick::GetPollingMax() const

-{      return 1000;    }
+{
+    return 1000;
+}

 
 //---------------------------------------------------------------------------
 // wxJoystick::Has[XXX]
 
 //---------------------------------------------------------------------------
 // wxJoystick::Has[XXX]


@@ -386,31 +443,61 @@ int wxJoystick::GetPollingMax() const
 // when enumerating the cookies of the joystick device
 //---------------------------------------------------------------------------
 bool wxJoystick::HasZ() const
 // when enumerating the cookies of the joystick device
 //---------------------------------------------------------------------------
 bool wxJoystick::HasZ() const

-{      return m_hid->HasElement(wxJS_AXIS_Z);  }
+{
+    return m_hid->HasElement(wxJS_AXIS_Z);
+}
+

 bool wxJoystick::HasRudder() const
 bool wxJoystick::HasRudder() const

-{      return m_hid->HasElement(wxJS_AXIS_RUDDER);     }
+{
+    return m_hid->HasElement(wxJS_AXIS_RUDDER);
+}
+

 bool wxJoystick::HasU() const
 bool wxJoystick::HasU() const

-{      return m_hid->HasElement(wxJS_AXIS_U);  }
+{
+    return m_hid->HasElement(wxJS_AXIS_U);
+}
+

 bool wxJoystick::HasV() const
 bool wxJoystick::HasV() const

-{      return m_hid->HasElement(wxJS_AXIS_V);  }
+{
+    return m_hid->HasElement(wxJS_AXIS_V);
+}

 
 //---------------------------------------------------------------------------
 // UNSUPPORTED
 //---------------------------------------------------------------------------
 int wxJoystick::GetPOVPosition() const
 
 //---------------------------------------------------------------------------
 // UNSUPPORTED
 //---------------------------------------------------------------------------
 int wxJoystick::GetPOVPosition() const

-{      return -1;                              }
+{
+    return -1;
+}
+

 int wxJoystick::GetPOVCTSPosition() const
 int wxJoystick::GetPOVCTSPosition() const

-{      return -1;                              }
+{
+    return -1;
+}
+

 int wxJoystick::GetMovementThreshold() const
 int wxJoystick::GetMovementThreshold() const

-{      return 0;                               }
+{
+    return 0;
+}
+

 void wxJoystick::SetMovementThreshold(int threshold)
 void wxJoystick::SetMovementThreshold(int threshold)

-{                                                      }
+{
+}
+

 bool wxJoystick::HasPOV() const
 bool wxJoystick::HasPOV() const

-{      return false;   }
+{
+    return false;
+}
+

 bool wxJoystick::HasPOV4Dir() const
 bool wxJoystick::HasPOV4Dir() const

-{      return false;   }
+{
+    return false;
+}
+

 bool wxJoystick::HasPOVCTS() const
 bool wxJoystick::HasPOVCTS() const

-{      return false;   }
+{
+    return false;
+}

 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //


@@ -420,7 +507,7 @@ bool wxJoystick::HasPOVCTS() const
 
 //---------------------------------------------------------------------------
 // wxHIDJoystick ctor
 
 //---------------------------------------------------------------------------
 // wxHIDJoystick ctor

-// 
+//

 // Initializes the min/max members
 //---------------------------------------------------------------------------
 wxHIDJoystick::wxHIDJoystick() :
 // Initializes the min/max members
 //---------------------------------------------------------------------------
 wxHIDJoystick::wxHIDJoystick() :


@@ -447,19 +534,19 @@ wxHIDJoystick::~wxHIDJoystick()
 bool wxHIDJoystick::Create(int nWhich)
 {
     int nJoysticks = GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);
 bool wxHIDJoystick::Create(int nWhich)
 {
     int nJoysticks = GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);

-    
+

     if (nWhich <= nJoysticks)
     if (nWhich <= nJoysticks)

-        return wxHIDDevice::Create(kHIDPage_GenericDesktop, 
-                                   kHIDUsage_GD_Joystick, 
+        return wxHIDDevice::Create(kHIDPage_GenericDesktop,
+                                   kHIDUsage_GD_Joystick,

                                    nWhich);
     else
         nWhich -= nJoysticks;
                                    nWhich);
     else
         nWhich -= nJoysticks;

-    
+

     int nGamePads = GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);
     int nGamePads = GetCount(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);

-    
+

     if (nWhich <= nGamePads)
     if (nWhich <= nGamePads)

-        return wxHIDDevice::Create(kHIDPage_GenericDesktop, 
-                                   kHIDUsage_GD_GamePad, 
+        return wxHIDDevice::Create(kHIDPage_GenericDesktop,
+                                   kHIDUsage_GD_GamePad,

                                    nWhich);
     else
     return false;
                                    nWhich);
     else
     return false;


@@ -472,20 +559,20 @@ bool wxHIDJoystick::Create(int nWhich)
 // Sets up the cookies for the HID device (called from Create) - as
 // mentioned 0-40 are the buttons and 40-50 are the axes.
 //
 // Sets up the cookies for the HID device (called from Create) - as
 // mentioned 0-40 are the buttons and 40-50 are the axes.
 //

-// MakeCookies is just a recursive function for each array within 
+// MakeCookies is just a recursive function for each array within

 // BuildCookies.
 //---------------------------------------------------------------------------
 void wxHIDJoystick::BuildCookies(CFArrayRef Array)
 {
 // BuildCookies.
 //---------------------------------------------------------------------------
 void wxHIDJoystick::BuildCookies(CFArrayRef Array)
 {

-       InitCookies(50, true);
+    InitCookies(50, true);

 
     //
     // I wasted two hours of my life on this line :(
     // accidently removed it during some source cleaning...
     //
     MakeCookies(Array);
 
     //
     // I wasted two hours of my life on this line :(
     // accidently removed it during some source cleaning...
     //
     MakeCookies(Array);

-    
-    //paranoid debugging stuff    
+
+    //paranoid debugging stuff

 #if 0
     for(int i = 0; i < 50; ++i)
         wxPrintf(wxT("\nVAL #%i:[%i]"), i, m_pCookies[i]);
 #if 0
     for(int i = 0; i < 50; ++i)
         wxPrintf(wxT("\nVAL #%i:[%i]"), i, m_pCookies[i]);


@@ -494,12 +581,12 @@ void wxHIDJoystick::BuildCookies(CFArrayRef Array)
 
 void wxHIDJoystick::MakeCookies(CFArrayRef Array)
 {
 
 void wxHIDJoystick::MakeCookies(CFArrayRef Array)
 {

-       int i, nUsage, nPage;
+    int i, nUsage, nPage;

 
 

-       for (i = 0; i < CFArrayGetCount(Array); ++i)
+    for (i = 0; i < CFArrayGetCount(Array); ++i)

     {
         const void* ref = CFDictionaryGetValue(
     {
         const void* ref = CFDictionaryGetValue(

-                (CFDictionaryRef)CFArrayGetValueAtIndex(Array, i), 
+                (CFDictionaryRef)CFArrayGetValueAtIndex(Array, i),

                 CFSTR(kIOHIDElementKey)
                                               );
 
                 CFSTR(kIOHIDElementKey)
                                               );
 


@@ -510,22 +597,22 @@ void wxHIDJoystick::MakeCookies(CFArrayRef Array)
         else
         {
             CFNumberGetValue(
         else
         {
             CFNumberGetValue(

-                           (CFNumberRef) 
-                               CFDictionaryGetValue( 
-                                   (CFDictionaryRef) CFArrayGetValueAtIndex(Array, i),
-                                   CFSTR(kIOHIDElementUsageKey)
-                                                   ), 
-                       kCFNumberIntType, 
-                               &nUsage    );
-                       
+                (CFNumberRef)
+                    CFDictionaryGetValue(
+                        (CFDictionaryRef) CFArrayGetValueAtIndex(Array, i),
+                        CFSTR(kIOHIDElementUsageKey)
+                                        ),
+                kCFNumberIntType,
+                &nUsage    );
+

             CFNumberGetValue(
             CFNumberGetValue(

-                           (CFNumberRef) 
-                               CFDictionaryGetValue(
-                                   (CFDictionaryRef) CFArrayGetValueAtIndex(Array, i), 
-                                   CFSTR(kIOHIDElementUsagePageKey)
-                                                   ), 
-                               kCFNumberIntType, 
-                               &nPage     );
+                (CFNumberRef)
+                    CFDictionaryGetValue(
+                        (CFDictionaryRef) CFArrayGetValueAtIndex(Array, i),
+                        CFSTR(kIOHIDElementUsagePageKey)
+                                        ),
+                kCFNumberIntType,
+                &nPage     );

 
 #if 0
             wxLogSysError(wxT("[%i][%i]"), nUsage, nPage);
 
 #if 0
             wxLogSysError(wxT("[%i][%i]"), nUsage, nPage);


@@ -539,28 +626,28 @@ void wxHIDJoystick::MakeCookies(CFArrayRef Array)
                 {
                     case kHIDUsage_GD_X:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_X);
                 {
                     case kHIDUsage_GD_X:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_X);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nXMax);
                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nXMax);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nXMin);
                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nXMin);

-                        break;                    
+                        break;

                     case kHIDUsage_GD_Y:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_Y);
                     case kHIDUsage_GD_Y:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_Y);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nYMax);
                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nYMax);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nYMin);
                         break;
                     case kHIDUsage_GD_Z:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_Z);
                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nYMin);
                         break;
                     case kHIDUsage_GD_Z:
                         AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_Z);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nZMax);
                                                  CFSTR(kIOHIDElementMaxKey),
                                                  &m_nZMax);

-                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                        wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nZMin);
                         break;
                                                  CFSTR(kIOHIDElementMinKey),
                                                  &m_nZMin);
                         break;


@@ -572,15 +659,15 @@ void wxHIDJoystick::MakeCookies(CFArrayRef Array)
             {
                 //rudder...
                 AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_RUDDER );
             {
                 //rudder...
                 AddCookieInQueue(CFArrayGetValueAtIndex(Array, i), wxJS_AXIS_RUDDER );

-                wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                          CFSTR(kIOHIDElementMaxKey),
                                          &m_nRudderMax);
                                          CFSTR(kIOHIDElementMaxKey),
                                          &m_nRudderMax);

-                wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i), 
+                wxGetIntFromCFDictionary(CFArrayGetValueAtIndex(Array, i),

                                          CFSTR(kIOHIDElementMinKey),
                                          &m_nRudderMin);
             }
         }
                                          CFSTR(kIOHIDElementMinKey),
                                          &m_nRudderMin);
             }
         }

-       }
+    }

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -589,9 +676,9 @@ void wxHIDJoystick::MakeCookies(CFArrayRef Array)
 // Simple accessors so that the HID callback and the thread procedure
 // can access members from wxHIDDevice (our parent here).
 //---------------------------------------------------------------------------
 // Simple accessors so that the HID callback and the thread procedure
 // can access members from wxHIDDevice (our parent here).
 //---------------------------------------------------------------------------

-IOHIDElementCookie* wxHIDJoystick::GetCookies() 
+IOHIDElementCookie* wxHIDJoystick::GetCookies()

 {   return m_pCookies;  }
 {   return m_pCookies;  }

-IOHIDQueueInterface** wxHIDJoystick::GetQueue() 
+IOHIDQueueInterface** wxHIDJoystick::GetQueue()

 {   return m_ppQueue;   }
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 {   return m_ppQueue;   }
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -637,16 +724,16 @@ void* wxJoystickThread::Entry()
         wxLogSysError(wxT("Couldn't create async event source"));
         return NULL;
     }
         wxLogSysError(wxT("Couldn't create async event source"));
         return NULL;
     }

-    
+

     wxASSERT(pRLSource != NULL);
 
     //attach runloop source to main run loop in thread
     CFRunLoopRef pRL = CFRunLoopGetCurrent();
     CFRunLoopAddSource(pRL, pRLSource, kCFRunLoopDefaultMode);
     wxASSERT( CFRunLoopContainsSource(pRL, pRLSource, kCFRunLoopDefaultMode) );
     wxASSERT(pRLSource != NULL);
 
     //attach runloop source to main run loop in thread
     CFRunLoopRef pRL = CFRunLoopGetCurrent();
     CFRunLoopAddSource(pRL, pRLSource, kCFRunLoopDefaultMode);
     wxASSERT( CFRunLoopContainsSource(pRL, pRLSource, kCFRunLoopDefaultMode) );

-          

 
 

-    if( (*m_hid->GetQueue())->setEventCallout(m_hid->GetQueue(), 
+
+    if( (*m_hid->GetQueue())->setEventCallout(m_hid->GetQueue(),

           wxJoystickThread::HIDCallback, this, this) != kIOReturnSuccess )
     {
         wxLogSysError(wxT("Could not set event callout for queue"));
           wxJoystickThread::HIDCallback, this, this) != kIOReturnSuccess )
     {
         wxLogSysError(wxT("Could not set event callout for queue"));


@@ -660,7 +747,7 @@ void* wxJoystickThread::Entry()
     }
 
     double dTime;
     }
 
     double dTime;

-    
+

     while(true)
     {
         if (TestDestroy())
     while(true)
     {
         if (TestDestroy())


@@ -674,16 +761,16 @@ void* wxJoystickThread::Entry()
         //true just "handles and returns" - false forces it to stay the time
         //amount
 #if 1
         //true just "handles and returns" - false forces it to stay the time
         //amount
 #if 1

-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, dTime, true);          
+        CFRunLoopRunInMode(kCFRunLoopDefaultMode, dTime, true);

 #else
         IOReturn ret = NULL;
         HIDCallback(this, ret, this, this);
         Sleep(3000);
 #endif
     }
 #else
         IOReturn ret = NULL;
         HIDCallback(this, ret, this, this);
         Sleep(3000);
 #endif
     }

-    
+

     wxASSERT( CFRunLoopContainsSource(pRL, pRLSource, kCFRunLoopDefaultMode) );
     wxASSERT( CFRunLoopContainsSource(pRL, pRLSource, kCFRunLoopDefaultMode) );

-    
+

     CFRunLoopRemoveSource(pRL, pRLSource, kCFRunLoopDefaultMode);
     CFRelease(pRLSource);
 
     CFRunLoopRemoveSource(pRL, pRLSource, kCFRunLoopDefaultMode);
     CFRelease(pRLSource);
 


@@ -698,7 +785,7 @@ void* wxJoystickThread::Entry()
 // This is where the REAL dirty work gets done.
 //
 // 1) Loops through each event the queue has recieved
 // This is where the REAL dirty work gets done.
 //
 // 1) Loops through each event the queue has recieved

-// 2) First, checks if the thread that is running the loop for 
+// 2) First, checks if the thread that is running the loop for

 //    the polling has ended - if so it breaks out
 // 3) Next, it checks if there was an error getting this event from
 //    the HID queue, if there was, it logs an error and returns
 //    the polling has ended - if so it breaks out
 // 3) Next, it checks if there was an error getting this event from
 //    the HID queue, if there was, it logs an error and returns


@@ -708,7 +795,7 @@ void* wxJoystickThread::Entry()
 // 5) Sends the event to the polling window (if any)
 // 6) Gets the next event and goes back to (1)
 //---------------------------------------------------------------------------
 // 5) Sends the event to the polling window (if any)
 // 6) Gets the next event and goes back to (1)
 //---------------------------------------------------------------------------

-/*static*/ void wxJoystickThread::HIDCallback(void* target, IOReturn res, 
+/*static*/ void wxJoystickThread::HIDCallback(void* target, IOReturn res,

                                               void* context, void* sender)
 {
     IOHIDEventStruct hidevent;
                                               void* context, void* sender)
 {
     IOHIDEventStruct hidevent;


@@ -716,13 +803,13 @@ void* wxJoystickThread::Entry()
     IOReturn ret;
     wxJoystickThread* pThis = (wxJoystickThread*) context;
     wxHIDJoystick* m_hid = pThis->m_hid;
     IOReturn ret;
     wxJoystickThread* pThis = (wxJoystickThread*) context;
     wxHIDJoystick* m_hid = pThis->m_hid;

-    
+

     //Get the "first" event from the queue
     //bogustime tells it we don't care at what time to start
     //where it gets the next from
     //Get the "first" event from the queue
     //bogustime tells it we don't care at what time to start
     //where it gets the next from

-    ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(), 
+    ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(),

                     &hidevent, bogustime, 0);
                     &hidevent, bogustime, 0);

-    
+

     while (ret != kIOReturnUnderrun)
     {
         if (pThis->TestDestroy())
     while (ret != kIOReturnUnderrun)
     {
         if (pThis->TestDestroy())


@@ -732,10 +819,10 @@ void* wxJoystickThread::Entry()
         {
             wxLogSysError(wxString::Format(wxT("wxJoystick Error:[%i]"), ret));
             return;
         {
             wxLogSysError(wxString::Format(wxT("wxJoystick Error:[%i]"), ret));
             return;

-        }      
-            
+        }
+

         wxJoystickEvent wxevent;
         wxJoystickEvent wxevent;

-        
+

         //Find the cookie that changed
         int nIndex = 0;
         IOHIDElementCookie* pCookies = m_hid->GetCookies();
         //Find the cookie that changed
         int nIndex = 0;
         IOHIDElementCookie* pCookies = m_hid->GetCookies();


@@ -743,20 +830,20 @@ void* wxJoystickThread::Entry()
         {
             if(hidevent.elementCookie == pCookies[nIndex])
                 break;
         {
             if(hidevent.elementCookie == pCookies[nIndex])
                 break;

-                
+

             ++nIndex;
             ++nIndex;

-        } 
-        
+        }
+

         //debugging stuff
 #if 0
         //debugging stuff
 #if 0

-        if(nIndex == 50) 
+        if(nIndex == 50)

         {
             wxLogSysError(wxString::Format(wxT("wxJoystick Out Of Bounds Error")));
             break;
         {
             wxLogSysError(wxString::Format(wxT("wxJoystick Out Of Bounds Error")));
             break;

-        }      
+        }

 #endif
 
 #endif
 

-        //is the cookie a button?    
+        //is the cookie a button?

         if (nIndex < 40)
         {
             if (hidevent.value)
         if (nIndex < 40)
         {
             if (hidevent.value)


@@ -790,14 +877,14 @@ void* wxJoystickThread::Entry()
             pThis->m_axe[2] = hidevent.value;
         }
         else
             pThis->m_axe[2] = hidevent.value;
         }
         else

-            wxevent.SetEventType(wxEVT_JOY_MOVE);            
+            wxevent.SetEventType(wxEVT_JOY_MOVE);

 
         Nanoseconds timestamp = AbsoluteToNanoseconds(hidevent.timestamp);
 
         Nanoseconds timestamp = AbsoluteToNanoseconds(hidevent.timestamp);

-        
+

         wxULongLong llTime(timestamp.hi, timestamp.lo);
         wxULongLong llTime(timestamp.hi, timestamp.lo);

-        
+

         llTime /= 1000000;
         llTime /= 1000000;

-        
+

         wxevent.SetTimestamp(llTime.GetValue());
         wxevent.SetJoystick(pThis->m_joystick);
         wxevent.SetButtonState(pThis->m_buttons);
         wxevent.SetTimestamp(llTime.GetValue());
         wxevent.SetJoystick(pThis->m_joystick);
         wxevent.SetButtonState(pThis->m_buttons);


@@ -806,12 +893,11 @@ void* wxJoystickThread::Entry()
         wxevent.SetEventObject(pThis->m_catchwin);
 
         if (pThis->m_catchwin)
         wxevent.SetEventObject(pThis->m_catchwin);
 
         if (pThis->m_catchwin)

-            pThis->m_catchwin->AddPendingEvent(wxevent);            
+            pThis->m_catchwin->AddPendingEvent(wxevent);

 
 

-        ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(), 
+        ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(),

                     &hidevent, bogustime, 0);
     }
 }
 
 #endif // wxUSE_JOYSTICK && defined(__DARWIN__)
                     &hidevent, bogustime, 0);
     }
 }
 
 #endif // wxUSE_JOYSTICK && defined(__DARWIN__)

-

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 89014b388ebd4883ee29ac938129a9adf6c740e8..e65eabae6d08d95f39b2fec107f4588c3e27d08d 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -17,6 +17,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -24,7 +25,6 @@
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/utils.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/utils.h"

-#include "wx/log.h"

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

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 97e4f7c7e2de4bb1e2b8ba61716058186429c0f2..d678b261eea3df8c77787ad80bfa51842c1064e6 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -18,11 +18,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/module.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/utils.h"

-#include "wx/log.h"

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

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index c3026cb75e1c0a58735631d895aec6dc4e2c95c8..d26d4684f63150b76ec0031578d0fbad36bc2cae 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -26,13 +26,13 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/dcmemory.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"

-#include "wx/log.h"

 
 #include <string.h>
 #include <mgraph.hpp>
 
 #include <string.h>
 #include <mgraph.hpp>

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index b47e45b3227264f2122b0288b8a65278aa033eac..d619798ed01c5b138c7e8265f20a94cbdcbd8484 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -22,10 +22,14 @@
 #endif
 
 #include "wx/font.h"
 #endif
 
 #include "wx/font.h"

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

 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/settings.h"


@@ -184,7 +188,7 @@ struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
             old->DecRef();
     }
 
             old->DecRef();
     }
 

-    wxMGLFontInstance *instance = 
+    wxMGLFontInstance *instance =

         M_FONTDATA->m_library->GetFontInstance(this, scale, antialiased);
 
     return instance->GetMGLfont_t();
         M_FONTDATA->m_library->GetFontInstance(this, scale, antialiased);
 
     return instance->GetMGLfont_t();

diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index f096ee1547eb91c11e1a24945f1eef0d01179e2e..5e202b2c754e27992c31f562ed2ce8b6d70441f2 100644 (file)
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 415af9a9732cdf21a7b488b04ab31f4e31aa985b..7bd3338d3b648c4d169142f5509a18f981cbc669 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -19,10 +19,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/process.h"
 
 #include <stdarg.h>
 #include "wx/process.h"
 
 #include <stdarg.h>

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index e17240229514c5b5f1acfc56bf396afaaa43322f..db894387037a0b39bc67e2c931c898aa49be253f 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -34,13 +34,13 @@
     #include "wx/app.h"
     #include "wx/panel.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/panel.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 
 #endif
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 

-#include "wx/log.h"

 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"
 #include "wx/dcscreen.h"
 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"
 #include "wx/dcscreen.h"

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 61fb6965971ef8dcb740a46e4fc21cb2dd518bd9..5ed71e7572d6665c5cbb66d9b9b201276da65cc4 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -22,12 +22,12 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #endif
 
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/memory.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS
 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 2c22186df2fe8f5e7fd10c6da7e6ffe3ad3249ab..c68155bd6cacd4a9922173abd8f4cdb43ea4d921 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -40,11 +40,15 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"

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

 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/image.h"

-#include "wx/log.h"

 #include "wx/math.h"
 
 #ifdef __VMS__
 #include "wx/math.h"
 
 #ifdef __VMS__

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 20b664b8df6b5d2ecbff26fb2c821d840c5fc1d8..5606dea15191c1a69a8c5545a39e0e82ca6c1f55 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -16,13 +16,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 562720af2db5e8f472962b3b23813fa70a962588..2b8b45d396b1793e6eff764e8989bd7f8ed15a23 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -27,12 +27,16 @@
 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"

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

 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/utils.h"
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/app.h"
 #include "wx/icon.h"
 
 #include "wx/app.h"
 #include "wx/icon.h"
 

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 23bd09861269691be5cbb21ee6c2107b7c73e3db..1158c22fe0840695d992edaab82734a8574fdc70 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -14,8 +14,11 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

 #endif
 
 #ifdef __VMS
 #endif
 
 #ifdef __VMS


@@ -23,9 +26,7 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/listbox.h"

 #include "wx/settings.h"
 #include "wx/settings.h"

-#include "wx/log.h"

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 21d7a88ac0f2188bbdf6fc9faa5f5c7f85c5a7ff..1f508801cdd09a6917b06a1a96602cb732aafd8c 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -21,8 +21,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/menu.h"
 #include "wx/wxprec.h"
 
 #include "wx/menu.h"

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

 #include "wx/menuitem.h"
 #include "wx/menuitem.h"

-#include "wx/log.h"

 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/frame.h"

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 7eab9dcd370b8521853cf5ebeaf0005b1ffe301b..b9df787ce501b15e7db3859d8d7e6b974474b0a4 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -28,6 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"

+    #include "wx/log.h"

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


@@ -42,7 +43,6 @@
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/evtloop.h"
 
 #if  wxUSE_DRAG_AND_DROP

diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp
index 76e2e536864c77b8a2a60c3659b5c9f1f3e21b29..0be46cd73d1d46477af6be5014176a7bb5af41e5 100644 (file)
--- a/src/msdos/mimetype.cpp
+++ b/src/msdos/mimetype.cpp
@@ -24,12 +24,12 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif //WX_PRECOMP
 
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/confbase.h"
 
 #include "wx/file.h"
 #include "wx/confbase.h"
 

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index d20fc302d8f44cd598c2705a186d50b124cfd64b..2507bc711ca0586b4a4f9f07c850c732ddfaf6f9 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -20,10 +20,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/process.h"
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 #include "wx/app.h"
 #include "wx/process.h"
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 #include "wx/app.h"

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index ebcaac16529ae4a744cd39442e198e1c821536b5..789fc53acf710b193e92fe921ada32ae80224731 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -34,10 +34,10 @@
     #include "wx/dcmemory.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"
     #include "wx/dcmemory.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/log.h"

 
 #if wxUSE_WXDIB
 #include "wx/msw/dib.h"
 
 #if wxUSE_WXDIB
 #include "wx/msw/dib.h"

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 23cd2cce07fc0e570f52d25c809b94d64a23f6ff..59d6f2fcb0dc75c1afe34c553c69ccf7b0411ce4 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        src/msw/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Clipboard functionality
 // Author:      Julian Smart
 // Modified by:


@@ -26,6 +26,8 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"


@@ -34,14 +36,13 @@
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 
 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 

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

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


@@ -931,4 +932,3 @@ bool wxClipboard::GetData( wxDataObject& data )
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD

-

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 080af680d291fb8cd233c596bf9c5e09946ddcda..890f27dffd0b6cd3c03af64fc094abe62805f4d7 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -28,9 +28,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/window.h"
 
 #include "wx/msw/private.h"
 #include "wx/window.h"
 
 #include "wx/msw/private.h"

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index b01e767cfb9df410f66cfa5cbbbe3cb4b6c1f5bf..c34f333ba5b55d8861f47912814994e432c92070 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -36,7 +36,6 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index fa0cb61a7249d7194dda854d7ce2f75dc72a31f1..01e42a155db3caa43780594aedcb59809363364a 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -34,10 +34,10 @@
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/log.h"

 #include "wx/frame.h"
 #include "wx/image.h"
 
 #include "wx/frame.h"
 #include "wx/image.h"
 

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index d0bcd12089a811e2dd7849a2c48e709f554daac7..7011de08ea23c9e78ea90aebc8c29f328f3e3123 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -29,13 +29,13 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/fontdlg.h"
 #include "wx/msw/wrapcdlg.h"
 
 #include "wx/cmndata.h"
 #endif
 
 #include "wx/fontdlg.h"
 #include "wx/msw/wrapcdlg.h"
 
 #include "wx/cmndata.h"

-#include "wx/log.h"

 #include "wx/math.h"
 
 #include <stdlib.h>
 #include "wx/math.h"
 
 #include <stdlib.h>

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1f06b6cefec6f3f79bfd9ccfcdff76bb33f4a56f..1d7e46da63b9d2be43810f30be4eec1757d78d28 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -34,6 +34,7 @@
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"


@@ -58,7 +59,6 @@
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 69e7c27e1158e180a31fed5ab8fe7569ffc0c620..7a42766424145339a5e2a97e26742925e07a2593 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -31,11 +31,11 @@
     #include "wx/string.h"
     #include "wx/dcmemory.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 
     #include <stdio.h>
 #endif
 
 
     #include <stdio.h>
 #endif
 

-#include "wx/log.h"

 #include "wx/image.h"
 
 #include "wx/msw/imaglist.h"
 #include "wx/image.h"
 
 #include "wx/msw/imaglist.h"

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 5761d72e1990f9ce3f43c378417bd09f2257529e..6c0617bb2f47651ab6725a6ea5c913f5f5bfa403 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -27,9 +27,9 @@
     #include  "wx/event.h"
     #include  "wx/app.h"
     #include  "wx/utils.h"
     #include  "wx/event.h"
     #include  "wx/app.h"
     #include  "wx/utils.h"

+    #include  "wx/log.h"

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  "wx/log.h"

 #include  "wx/config.h"
 #include  "wx/file.h"
 
 #include  "wx/config.h"
 #include  "wx/file.h"
 

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index f5c67dba298c448ec894a2b73cb113313a336176..e9e500591e790bd8514019e867124d89eaa373ff 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -26,6 +26,7 @@
     #include "wx/font.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/font.h"
     #include "wx/dc.h"
     #include "wx/utils.h"

+    #include "wx/log.h"

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


@@ -33,8 +34,6 @@
 
 #include <windowsx.h>
 
 
 #include <windowsx.h>
 

-#include "wx/log.h"
-

 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index d99997daed6cb1cdd0faa40d640043e894633445..4ecc52bd13e386c3f06e7224e436e257e88d8fdf 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -27,23 +27,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-//---------------------------------------------------------------------------
-// MediaCtrl include
-//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+

 #include "wx/mediactrl.h"
 
 #include "wx/mediactrl.h"
 

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-//---------------------------------------------------------------------------
-// WX Includes
-//---------------------------------------------------------------------------
-#include "wx/log.h"         // wxLogDebug

 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dcclient.h"
 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dcclient.h"


@@ -4179,7 +4173,4 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(basewxmediabackends)
 
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(basewxmediabackends)
 

-//---------------------------------------------------------------------------
-//  End wxMediaCtrl Compilation Guard and this file
-//---------------------------------------------------------------------------

 #endif //wxUSE_MEDIACTRL
 #endif //wxUSE_MEDIACTRL

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 52644f1bc856653fb890f129d96d958832c4774e..72e4008b9aee1a96c8527b846bcf800cb0ec10e1 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -47,7 +47,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 // disable "cast truncates constant value" for VARIANT_BOOL values
 #endif
 
 // disable "cast truncates constant value" for VARIANT_BOOL values


@@ -56,20 +56,14 @@
 #pragma warning (disable:4310)
 #endif
 
 #pragma warning (disable:4310)
 #endif
 

-//---------------------------------------------------------------------------
-// MediaCtrl include
-//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+

 #include "wx/mediactrl.h"
 
 #include "wx/mediactrl.h"
 

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-//---------------------------------------------------------------------------
-// WX Includes
-//---------------------------------------------------------------------------
-#include "wx/log.h"         // wxLogDebug

 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dcclient.h"
 #include "wx/math.h"        // log10 & pow
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dcclient.h"


@@ -2263,7 +2257,4 @@ void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(wxmediabackend_am)
 
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(wxmediabackend_am)
 

-//---------------------------------------------------------------------------
-//  End wxMediaCtrl Compilation Guard and this file
-//---------------------------------------------------------------------------

 #endif // wxUSE_MEDIACTRL
 #endif // wxUSE_MEDIACTRL

diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index e1f8e1d08879b71ae95f744f50a50f83398a7844..2dc26fdbdf6cfb1646eaa33d400f91345c375150 100644 (file)
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -50,20 +50,14 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//---------------------------------------------------------------------------
-// MediaCtrl include
-//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+

 #include "wx/mediactrl.h"
 
 #include "wx/mediactrl.h"
 

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-//---------------------------------------------------------------------------
-// WX Includes
-//---------------------------------------------------------------------------
-#include "wx/log.h"         // wxLogDebug

 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/msw/ole/activex.h" // wxActiveXContainer - COM-specific stuff
 
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/msw/ole/activex.h" // wxActiveXContainer - COM-specific stuff
 


@@ -1515,7 +1509,4 @@ bool MyApp::OnInit()
 
 #endif // WMP mobile 9 hacks
 
 
 #endif // WMP mobile 9 hacks
 

-//---------------------------------------------------------------------------
-//  End wxMediaCtrl Compilation Guard and this file
-//---------------------------------------------------------------------------

 #endif // wxUSE_MEDIACTRL
 #endif // wxUSE_MEDIACTRL

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 6c0d6cf3589231918d00410d87ab2671510ffa5e..085dc6e47f280da58f1d5dbd1bad347c251d473f 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/msw/menuitem.cpp

 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,6 +26,8 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+#include "wx/menu.h"
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"


@@ -33,12 +35,11 @@
     #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"

-    #include "wx/menu.h"

     #include "wx/string.h"
     #include "wx/string.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"


@@ -399,7 +400,7 @@ void wxMenuItem::SetText(const wxString& text)
         info.cbSize = sizeof(info);
         info.fMask = MIIM_TYPE;
         info.fType = MFT_STRING;
         info.cbSize = sizeof(info);
         info.fMask = MIIM_TYPE;
         info.fType = MFT_STRING;

-        info.cch = text.Length();
+        info.cch = text.length();

         info.dwTypeData = (LPTSTR) data ;
         if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) )
         {
         info.dwTypeData = (LPTSTR) data ;
         if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) )
         {

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 7e78e570da82854a498d5bd7fd21fec966ad11bb..4720084cba385a5c37038760939a3b9ce709b5dc 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -24,13 +24,13 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 80f2fc703076e221fb3c790b5d4388759fbbdeed..2cca53006560b66dd1f292cce4852989e6ea4f33 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -18,17 +18,17 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

-// wxWidgets
+#include  "wx/notebook.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include  "wx/string.h"
-  #include  "wx/dc.h"
+    #include  "wx/string.h"
+    #include  "wx/dc.h"
+    #include  "wx/log.h"

 #endif  // WX_PRECOMP
 
 #endif  // WX_PRECOMP
 

-#include  "wx/log.h"

 #include  "wx/imaglist.h"
 #include  "wx/event.h"
 #include  "wx/control.h"
 #include  "wx/imaglist.h"
 #include  "wx/event.h"
 #include  "wx/control.h"

-#include  "wx/notebook.h"

 #include  "wx/app.h"
 #include  "wx/sysopt.h"
 #include  "wx/dcclient.h"
 #include  "wx/app.h"
 #include  "wx/sysopt.h"
 #include  "wx/dcclient.h"


@@ -275,7 +275,7 @@ bool wxNotebook::Create(wxWindow *parent,
         style |= wxBORDER_SUNKEN;
 #endif
 
         style |= wxBORDER_SUNKEN;
 #endif
 

-#if !wxUSE_UXTHEME 
+#if !wxUSE_UXTHEME

     // ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can
     // work around it later (after control creation), but if we don't have uxtheme, we have to clear
     // those styles
     // ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can
     // work around it later (after control creation), but if we don't have uxtheme, we have to clear
     // those styles


@@ -345,14 +345,14 @@ bool wxNotebook::Create(wxWindow *parent,
         // create backing store
         UpdateBgBrush();
     }
         // create backing store
         UpdateBgBrush();
     }

-    
+

     // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
     // control is simply not rendered correctly), so we disable themes
     // if possible, otherwise we simply clear the styles.
     // It's probably not possible to have UXTHEME without ComCtl32 6 or better, but lets
     // check it anyway.
     const int verComCtl32 = wxApp::GetComCtl32Version();
     // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the
     // control is simply not rendered correctly), so we disable themes
     // if possible, otherwise we simply clear the styles.
     // It's probably not possible to have UXTHEME without ComCtl32 6 or better, but lets
     // check it anyway.
     const int verComCtl32 = wxApp::GetComCtl32Version();

-    if ( verComCtl32 == 600 ) 
+    if ( verComCtl32 == 600 )

     {
         // check if we use themes at all -- if we don't, we're still okay
         if ( wxUxThemeEngine::GetIfActive() && (style & (wxBK_BOTTOM|wxBK_LEFT|wxBK_RIGHT)))
     {
         // check if we use themes at all -- if we don't, we're still okay
         if ( wxUxThemeEngine::GetIfActive() && (style & (wxBK_BOTTOM|wxBK_LEFT|wxBK_RIGHT)))


@@ -861,7 +861,7 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event))
     HBRUSH hbr = (HBRUSH)m_hbrBackground;
 #else
     HBRUSH hbr = 0;
     HBRUSH hbr = (HBRUSH)m_hbrBackground;
 #else
     HBRUSH hbr = 0;

-#endif    
+#endif

     wxBrush brush;
     if ( !hbr )
     {
     wxBrush brush;
     if ( !hbr )
     {

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 56f871eece620f0567fc3cce09b7112027c97b50..e168dda881f0348644285ab9434b5eb92a9c6b7e 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -24,15 +24,15 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

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

 #if wxUSE_OLE && wxUSE_ACCESSIBILITY
 
 #if wxUSE_OLE && wxUSE_ACCESSIBILITY
 

-#include "wx/log.h"

 #include "wx/access.h"
 
 #include "wx/access.h"
 

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

 #include "wx/msw/wrapwin.h"
 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #include "wx/msw/wrapwin.h"
 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h


@@ -1991,4 +1991,4 @@ wxAccSelectionFlags wxConvertFromWindowsSelFlag(int sel)
 }
 
 
 }
 
 

-#endif  //USE_ACCESSIBILITY
+#endif  // wxUSE_OLE && wxUSE_ACCESSIBILITY

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 548ac661a80955cc789268c98b7c2335a9d3a094..28464845afae3d926efde7342e6b39122b975e56 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -20,8 +20,11 @@
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 

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

 #define _FORCENAMELESSUNION
 #define _FORCENAMELESSUNION

-#include "wx/log.h"

 #include "wx/msw/private.h"
 #include "wx/msw/ole/oleutils.h"
 #include "wx/msw/ole/automtn.h"
 #include "wx/msw/private.h"
 #include "wx/msw/ole/oleutils.h"
 #include "wx/msw/ole/automtn.h"


@@ -88,7 +91,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     {
         // Use dot notation to get the next object
         wxString member2(nonConstMember.Left((size_t) ch));
     {
         // Use dot notation to get the next object
         wxString member2(nonConstMember.Left((size_t) ch));

-        wxString rest(nonConstMember.Right(nonConstMember.Length() - ch - 1));
+        wxString rest(nonConstMember.Right(nonConstMember.length() - ch - 1));

         wxAutomationObject obj;
         if (!GetObject(obj, member2))
             return false;
         wxAutomationObject obj;
         if (!GetObject(obj, member2))
             return false;

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 91dcb37866410ab69600269d1b52547a3c5581d1..90f89d419e0412b09bf9659b2f3761c8fcf6f98e 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -24,13 +24,13 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_OLE && wxUSE_DRAG_AND_DROP
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_OLE && wxUSE_DRAG_AND_DROP
-
-#include "wx/log.h"

 #include "wx/dnd.h"
 
 #include "wx/msw/private.h"
 #include "wx/dnd.h"
 
 #include "wx/msw/private.h"


@@ -245,4 +245,4 @@ bool wxDropSource::GiveFeedback(wxDragResult effect)
     }
 }
 
     }
 }
 

-#endif  //USE_DRAG_AND_DROP
+#endif  // wxUSE_OLE && wxUSE_DRAG_AND_DROP

diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index e3d3791d26aab513b607c96ab6f98a49dfdfce86..1301f08d470de21a3f8e93aa71741745ffc1fba6 100644 (file)
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -21,13 +21,16 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 
 #endif
 
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 

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

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

-#include "wx/log.h"

 
 #ifdef __WXWINCE__
     #include <winreg.h>
 
 #ifdef __WXWINCE__
     #include <winreg.h>


@@ -544,5 +547,4 @@ static DWORD ConvertDragResultToEffect(wxDragResult result)
     }
 }
 
     }
 }
 

-#endif
- // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_OLE && wxUSE_DRAG_AND_DROP

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 6c9e409042e0326d16954adf41b1c4a6304c18fd..058f4afd87c658eec6f6fcf638996dbe0867c858 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -21,13 +21,15 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include  "wx/log.h"
-

 #if wxUSE_OLE
 
 #if wxUSE_OLE
 

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

 #ifndef __CYGWIN10__
 
 #include "wx/msw/private.h"
 #ifndef __CYGWIN10__
 
 #include "wx/msw/private.h"

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index a8e3297d5ae87c6b6ee0907dae0c2270975ca03a..82fcaf46d8ca1b891bd730007d7451b26268f61a 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -36,12 +36,12 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"

-#include "wx/log.h"

 #include "wx/msw/private.h"
 
 #include <stdlib.h>
 #include "wx/msw/private.h"
 
 #include <stdlib.h>

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 4684ba918867d222c0e6ac1e1dcb943b18bae9fe..1c9892c0b9e539b8f6387e74ed3576b2dd7e4325 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/regconf.cpp
+// Name:        src/msw/regconf.cpp

 // Purpose:
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:
 // Author:      Vadim Zeitlin
 // Modified by:


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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CONFIG
+
+#include "wx/config.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

 #endif //WX_PRECOMP
 
 #include "wx/event.h"
 #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/event.h"
 #include "wx/app.h"

-#include "wx/log.h"
-
-#if wxUSE_CONFIG
-
-#include "wx/config.h"

 
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"
 
 #include "wx/msw/registry.h"
 #include "wx/msw/regconf.h"


@@ -76,9 +76,9 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   // the convention is to put the programs keys under <vendor>\<appname>
   // (but it can be overriden by specifying the pathes explicitly in strLocal
   // and/or strGlobal)
   // the convention is to put the programs keys under <vendor>\<appname>
   // (but it can be overriden by specifying the pathes explicitly in strLocal
   // and/or strGlobal)

-  if ( strLocal.IsEmpty() || (strGlobal.IsEmpty() && bDoUseGlobal) )
+  if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )

   {
   {

-    if ( vendorName.IsEmpty() )
+    if ( vendorName.empty() )

     {
       if ( wxTheApp )
         strRoot = wxTheApp->GetVendorName();
     {
       if ( wxTheApp )
         strRoot = wxTheApp->GetVendorName();


@@ -89,12 +89,12 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
     }
 
     // no '\\' needed if no vendor name
     }
 
     // no '\\' needed if no vendor name

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

     {
       strRoot += '\\';
     }
 
     {
       strRoot += '\\';
     }
 

-    if ( appName.IsEmpty() )
+    if ( appName.empty() )

     {
       wxCHECK_RET( wxTheApp, wxT("No application name in wxRegConfig ctor!") );
       strRoot << wxTheApp->GetAppName();
     {
       wxCHECK_RET( wxTheApp, wxT("No application name in wxRegConfig ctor!") );
       strRoot << wxTheApp->GetAppName();


@@ -106,7 +106,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   }
   //else: we don't need to do all the complicated stuff above
 
   }
   //else: we don't need to do all the complicated stuff above
 

-  wxString str = strLocal.IsEmpty() ? strRoot : strLocal;
+  wxString str = strLocal.empty() ? strRoot : strLocal;

 
   // as we're going to change the name of these keys fairly often and as
   // there are only few of wxRegConfig objects (usually 1), we can allow
 
   // as we're going to change the name of these keys fairly often and as
   // there are only few of wxRegConfig objects (usually 1), we can allow


@@ -122,7 +122,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
 
   if ( bDoUseGlobal )
   {
 
   if ( bDoUseGlobal )
   {

-    str = strGlobal.IsEmpty() ? strRoot : strGlobal;
+    str = strGlobal.empty() ? strRoot : strGlobal;

 
     m_keyGlobalRoot.ReserveMemoryForName(MEMORY_PREALLOC);
     m_keyGlobal.ReserveMemoryForName(MEMORY_PREALLOC);
 
     m_keyGlobalRoot.ReserveMemoryForName(MEMORY_PREALLOC);
     m_keyGlobal.ReserveMemoryForName(MEMORY_PREALLOC);


@@ -171,7 +171,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
         // because GetPath() returns "" when we're at root, we must understand
         // empty string as "/"
 
         // because GetPath() returns "" when we're at root, we must understand
         // empty string as "/"

-        if ( strPath.IsEmpty() || (strPath[0] == wxCONFIG_PATH_SEPARATOR) ) {
+        if ( strPath.empty() || (strPath[0] == wxCONFIG_PATH_SEPARATOR) ) {

             // absolute path
             wxSplitPath(aParts, strPath);
         }
             // absolute path
             wxSplitPath(aParts, strPath);
         }

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index d0d050f6f24aa5c164294055c50d1e483e1ea2ce..f35ecd279c0961e1274342e1e5f996b9daa5fab9 100644 (file)
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include  "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include  "wx/intl.h"

+    #include  "wx/log.h"

 #endif
 
 #endif
 

-#include  "wx/log.h"

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 9099fb4b2b35751a78afb08ac27e10a8e8f824d4..3c774a2457f182d7ad622651e543ee3c191fc6dc 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -25,10 +25,9 @@
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #include "wx/msw/private.h"
 #include <windowsx.h>
 
 #include "wx/msw/private.h"
 #include <windowsx.h>
 

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index b6d787a4a39c70db3c7f849aeeb8c196dfa0cec9..67f82e9bbdd1cf03dc1c3b80856d9413c3983747 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -26,8 +26,11 @@
 
 #if wxUSE_TREECTRL
 
 
 #if wxUSE_TREECTRL
 

+#include "wx/treectrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -42,10 +45,8 @@
 #define wxUSE_COMCTL32_SAFELY 0
 
 #include "wx/app.h"
 #define wxUSE_COMCTL32_SAFELY 0
 
 #include "wx/app.h"

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"

-#include "wx/treectrl.h"

 #include "wx/msw/dragimag.h"
 
 // macros to hide the cast ugliness
 #include "wx/msw/dragimag.h"
 
 // macros to hide the cast ugliness

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 416e52c751e8fb977ed0a6eacd40bb9adfe10fc9..2591047c61cc4463e5d9fb9804b288d65d64f80a 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+

 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"

-    #include "wx/window.h"

     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"


@@ -44,6 +45,7 @@
     #include "wx/statbox.h"
     #include "wx/sizer.h"
     #include "wx/intl.h"
     #include "wx/statbox.h"
     #include "wx/sizer.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)


@@ -71,7 +73,6 @@
 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -87,8 +88,6 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 

-#include "wx/log.h"
-

 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 050117d47f74a6f4be427a8bd6b71075be603736..7cf9125bc27c42b1a44d2dc1339d76acf092cc97 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -12,10 +12,11 @@
 // 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/app.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"


@@ -31,9 +32,9 @@
     #include "wx/icon.h"
     #include "wx/stdpaths.h"
     #include "wx/filename.h"
     #include "wx/icon.h"
     #include "wx/stdpaths.h"
     #include "wx/filename.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/module.h"
 
 #include "wx/os2/private.h"
 #include "wx/module.h"
 
 #include "wx/os2/private.h"

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index f60d0f7c9b75e60e68bb6b5b656797f247b2acd5..6c4cb2fd22ba6ba52829761bc4fc44bbf7827c7a 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -12,6 +12,8 @@
 // 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/bitmap.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -20,12 +22,11 @@
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"

-    #include "wx/bitmap.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 7d5566b9122ae7b04a96e66e6fc2aa94a5bb4486..692eafb574dba1627251c35864dc0d5ec416fd29 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -18,8 +18,11 @@
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 

+#include "wx/checklst.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"

+    #include "wx/log.h"

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


@@ -31,8 +34,6 @@
 #include "wx/settings.h"
 #include "wx/dcmemory.h"
 #include "wx/dcscreen.h"
 #include "wx/settings.h"
 #include "wx/dcmemory.h"
 #include "wx/dcscreen.h"

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

 
 #define INCL_PM
 #include <os2.h>
 
 #define INCL_PM
 #include <os2.h>

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index a3691d7e0f5a7bf25bb58365b4d18b61309257dd..5c05cdc294196c3eb2451a6ffdfd28438f24f6a7 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -14,6 +14,8 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"


@@ -22,15 +24,13 @@
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 
 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 

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

 #include <string.h>
 
 #include "wx/os2/private.h"
 #include <string.h>
 
 #include "wx/os2/private.h"

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 24de249cc2b8ac359aaf0e9ab3a4ee14c4251f99..c313cb51d24fd869c880f75218859efa7a35b52f 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -24,9 +24,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/window.h"
 #include "wx/app.h"
 
 #include "wx/window.h"
 #include "wx/app.h"
 

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 655622d16f35f25be094df564710a29aa3158b4f..edd3969173a6fd5e30eaae9699c1a852fdb614cb 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -25,9 +25,9 @@
     #include "wx/app.h"
     #include "wx/math.h"
     #include "wx/string.h"
     #include "wx/app.h"
     #include "wx/math.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/window.h"
 #include "wx/os2/private.h"
 
 #include "wx/window.h"
 #include "wx/os2/private.h"
 

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 06f4e62c6749fc37bb1691d0ea2927e5f2b021ed..99e6b11d2c9b3ca5e06b4bfe718217650d7bf16c 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -12,18 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 8ed9c42574bd819e46000b4ca920eb08c440b895..08f615fe5051efeba6db1f35a74497cafd093871 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        os2/evtloop.cpp
+// Name:        src/os2/evtloop.cpp

 // Purpose:     implements wxEventLoop for PM
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements wxEventLoop for PM
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -28,10 +28,10 @@
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/timer.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/timer.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

-#include "wx/log.h"

 #include "wx/tooltip.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/tooltip.h"
 #include "wx/ptr_scpd.h"
 


@@ -164,11 +164,11 @@ bool wxEventLoopImpl::PreProcessMessage(QMSG *pMsg)
            {
                if((bRc = pWnd->OS2TranslateMessage((WXMSG*)pMsg)) == TRUE)
                    break;
            {
                if((bRc = pWnd->OS2TranslateMessage((WXMSG*)pMsg)) == TRUE)
                    break;

-           // stop at first top level window, i.e. don't try to process the
-           // key strokes originating in a dialog using the accelerators of
-           // the parent frame - this doesn't make much sense
-           if ( pWnd->IsTopLevel() )
-               break;
+               // stop at first top level window, i.e. don't try to process the
+               // key strokes originating in a dialog using the accelerators of
+               // the parent frame - this doesn't make much sense
+               if ( pWnd->IsTopLevel() )
+                   break;

            }
 
             if(!bRc)    // untranslated, should restore original value
            }
 
             if(!bRc)    // untranslated, should restore original value


@@ -259,20 +259,20 @@ int wxEventLoop::Run()
         // generate and process idle events for as long as we don't have
         // anything else to do
         while ( !Pending() && m_impl->SendIdleMessage() )
         // generate and process idle events for as long as we don't have
         // anything else to do
         while ( !Pending() && m_impl->SendIdleMessage() )

-       {
-           wxTheApp->HandleSockets();
-           wxMilliSleep(10);
-       }
+        {
+            wxTheApp->HandleSockets();
+            wxMilliSleep(10);
+        }

 
         wxTheApp->HandleSockets();
         if (Pending())
 
         wxTheApp->HandleSockets();
         if (Pending())

-       {
-           if ( !Dispatch() )
-           {
-               // we got WM_QUIT
-               break;
-           }
-       }
+        {
+            if ( !Dispatch() )
+            {
+                // we got WM_QUIT
+                break;
+            }
+        }

         else
             wxMilliSleep(10);
     }
         else
             wxMilliSleep(10);
     }


@@ -301,7 +301,7 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
 
 bool wxEventLoop::Dispatch()
 {

-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );

 
     QMSG msg;
     BOOL bRc = ::WinGetMsg(vHabmain, &msg, (HWND) NULL, 0, 0);
 
     QMSG msg;
     BOOL bRc = ::WinGetMsg(vHabmain, &msg, (HWND) NULL, 0, 0);


@@ -309,14 +309,14 @@ bool wxEventLoop::Dispatch()
     if ( bRc == 0 )
     {
         // got WM_QUIT
     if ( bRc == 0 )
     {
         // got WM_QUIT

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only the main thread can process Windows messages") );
 
     }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only the main thread can process Windows messages") );
 

-    static bool s_hadGuiLock = TRUE;
+    static bool s_hadGuiLock = true;

     static wxMsgArray s_aSavedMessages;
 
     // if a secondary thread owning the mutex is doing GUI calls, save all
     static wxMsgArray s_aSavedMessages;
 
     // if a secondary thread owning the mutex is doing GUI calls, save all


@@ -324,7 +324,7 @@ bool wxEventLoop::Dispatch()
     // it will lead to recursive library calls (and we're not reentrant)
     if ( !wxGuiOwnedByMainThread() )
     {
     // it will lead to recursive library calls (and we're not reentrant)
     if ( !wxGuiOwnedByMainThread() )
     {

-        s_hadGuiLock = FALSE;
+        s_hadGuiLock = false;

 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice


@@ -333,7 +333,7 @@ bool wxEventLoop::Dispatch()
             s_aSavedMessages.Add(msg);
         }
 
             s_aSavedMessages.Add(msg);
         }
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {


@@ -344,7 +344,7 @@ bool wxEventLoop::Dispatch()
         //       messages normally - expect some things to break...
         if ( !s_hadGuiLock )
         {
         //       messages normally - expect some things to break...
         if ( !s_hadGuiLock )
         {

-            s_hadGuiLock = TRUE;
+            s_hadGuiLock = true;

 
             size_t count = s_aSavedMessages.Count();
             for ( size_t n = 0; n < count; n++ )
 
             size_t count = s_aSavedMessages.Count();
             for ( size_t n = 0; n < count; n++ )


@@ -360,6 +360,5 @@ bool wxEventLoop::Dispatch()
 
     m_impl->ProcessMessage(&msg);
 
 
     m_impl->ProcessMessage(&msg);
 

-    return TRUE;
+    return true;

 }
 }

-

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index f8c4e9d11aa7f7d911f930c2217749634e83779f..d04ed2f8f8762bb2a09d85a42d19c6c118ec7c39 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -43,7 +43,6 @@
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index db81983a3a003ea68ab59d339c67d55cb6f3ee79..d2212870c4cd54f6bff64f80111f15391f777c7e 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -21,10 +21,9 @@
     #include  "wx/event.h"
     #include  "wx/app.h"
     #include  "wx/utils.h"
     #include  "wx/event.h"
     #include  "wx/app.h"
     #include  "wx/utils.h"

+    #include  "wx/log.h"

 #endif  //WX_PRECOMP
 
 #endif  //WX_PRECOMP
 

-#include  "wx/log.h"
-

 #include  "wx/config.h"
 
 #include  "wx/os2/iniconf.h"
 #include  "wx/config.h"
 
 #include  "wx/os2/iniconf.h"

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index eea8872b6b6186c873bf3b34983f8e0cd2d0c193..11e6a92bc7e354fccb46be6f2e98eb3d71b95a13 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -14,9 +14,10 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

-    #include "wx/listbox.h"

     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"


@@ -24,6 +25,7 @@
     #include "wx/dcscreen.h"
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/dcscreen.h"
     #include "wx/utils.h"
     #include "wx/scrolwin.h"

+    #include "wx/log.h"

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


@@ -32,8 +34,6 @@
 #define INCL_M
 #include <os2.h>
 
 #define INCL_M
 #include <os2.h>
 

-#include "wx/log.h"
-

 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 27302245d36cc214cc83f0ceaf63958dea3251c5..06ea4c8185256c20f559a626528c3c9a5986e32c 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/os2/menuitem.cpp

 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:


@@ -16,6 +16,8 @@
 // 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/menuitem.h"
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"


@@ -25,11 +27,9 @@
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

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

 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL

diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp
index e512298a934735c625300002610de58e6374e264..69cec9db89ceb3007d522783d54d89670e0feb26 100644 (file)
--- a/src/os2/mimetype.cpp
+++ b/src/os2/mimetype.cpp
@@ -20,6 +20,7 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif


@@ -30,7 +31,6 @@
 #define INCL_WIN
 #include <os2.h>
 
 #define INCL_WIN
 #include <os2.h>
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/confbase.h"

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index ee9b6810ebfe2c74e1188fe15f5c18c184a6ffdf..b0765dd8e85890aa6312e800de396f18d4f594bd 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -14,19 +14,20 @@
 
 #if wxUSE_NOTEBOOK
 
 
 #if wxUSE_NOTEBOOK
 

+#include  "wx/notebook.h"
+

 // wxWidgets
 #ifndef WX_PRECOMP
 // wxWidgets
 #ifndef WX_PRECOMP

-  #include "wx/app.h"
-  #include "wx/dcclient.h"
-  #include "wx/string.h"
-  #include "wx/settings.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/string.h"
+    #include "wx/settings.h"
+    #include  "wx/log.h"

 #endif  // WX_PRECOMP
 
 #endif  // WX_PRECOMP
 

-#include  "wx/log.h"

 #include  "wx/imaglist.h"
 #include  "wx/event.h"
 #include  "wx/control.h"
 #include  "wx/imaglist.h"
 #include  "wx/event.h"
 #include  "wx/control.h"

-#include  "wx/notebook.h"

 
 #include  "wx/os2/private.h"
 
 
 #include  "wx/os2/private.h"
 

diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp
index ab764d8dcefd3ae4be7805ed42938421781a090a..e9663eebf90f92d0634f2b7436f33c57b26d51a8 100644 (file)
--- a/src/os2/statline.cpp
+++ b/src/os2/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/statline.cpp
+// Name:        src/os2/statline.cpp

 // Purpose:     OS2 version of wxStaticLine class
 // Author:      David Webster
 // Created:     10/23/99
 // Purpose:     OS2 version of wxStaticLine class
 // Author:      David Webster
 // Created:     10/23/99


@@ -19,12 +19,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 
 #include "wx/statline.h"
 

-#if wxUSE_STATLINE
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/os2/private.h"
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index e1dd0bf7d422085e37bf29afb98ca5d8089634fe..33cb46646db39390f910b6773a67bf33b75dd38b 100644 (file)
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -22,13 +22,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #endif //WX_PRECOMP
 
 #include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/module.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 72d7b1cdf28e661fd01e12a9b5dee40289ba4ee0..9036f7d5aa84dee362cfb3e0fb5cbdcac3b5e239 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -18,10 +18,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index da60f7a692466703edc33293709b928e8f095905..f95caad05b691da27f1731fa764f6297907d0c92 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -26,17 +26,18 @@
 
 #if wxUSE_TREECTRL
 
 
 #if wxUSE_TREECTRL
 

+#include "wx/treectrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 
 #include "wx/app.h"
 #endif
 
 #include "wx/os2/private.h"
 
 #include "wx/app.h"

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"

-#include "wx/os2/treectrl.h"

 
 // a macro to hide the ugliness of nested casts
 #define HITEM(item)     (HTREEITEM)(WXHTREEITEM)(item)
 
 // a macro to hide the ugliness of nested casts
 #define HITEM(item)     (HTREEITEM)(WXHTREEITEM)(item)

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 20da3f30ba3f47aeb6a1526839ad03da893cd80f..00698431ff15fdf130eff83a2c57246d5c479962 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -12,10 +12,12 @@
 // 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/utils.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/utils.h"

     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"


@@ -26,7 +28,6 @@
 #include <dirent.h>
 #endif
 
 #include <dirent.h>
 #endif
 

-#include "wx/log.h"

 
 #include <io.h>
 
 
 #include <io.h>
 


@@ -135,19 +136,17 @@ int wxKill(long         lPid,
 //
 // Execute a program in an Interactive Shell
 //
 //
 // Execute a program in an Interactive Shell
 //

-bool wxShell(
-  const wxString&                   rCommand
-)
+bool wxShell( const wxString& rCommand )

 {
 {

-    wxChar*                         zShell = _T("CMD.EXE");
-    wxString                        sInputs;
-    STARTDATA                       SData = {0};
-    PSZ                             PgmTitle = "Command Shell";
-    APIRET                          rc;
-    PID                             vPid = 0;
-    ULONG                           ulSessID = 0;
-    UCHAR                           achObjBuf[256] = {0}; //error data if DosStart fails
-    RESULTCODES                     vResult;
+    wxChar*     zShell = _T("CMD.EXE");
+    wxString    sInputs;
+    STARTDATA   SData = {0};
+    PSZ         PgmTitle = "Command Shell";
+    APIRET      rc;
+    PID         vPid = 0;
+    ULONG       ulSessID = 0;
+    UCHAR       achObjBuf[256] = {0}; //error data if DosStart fails
+    RESULTCODES vResult;

 
     SData.Length   = sizeof(STARTDATA);
     SData.Related  = SSF_RELATED_INDEPENDENT;
 
     SData.Length   = sizeof(STARTDATA);
     SData.Related  = SSF_RELATED_INDEPENDENT;

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 909da35a3ac07828bcd16692616d5474b3dc4ee2..36cb21733e6ba6f22ab5294ca9d9b8a1aac8998d 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -16,10 +16,9 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #include "wx/process.h"
 
 #include "wx/os2/private.h"
 #include "wx/process.h"
 
 #include "wx/os2/private.h"

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index d49aaf21a17318714c2afa1b3e5ab42f63a1d2ca..72bebe9beed3a14960c825d67988efd757939e12 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -14,11 +14,12 @@
 //
 #include "wx/wxprec.h"
 
 //
 #include "wx/wxprec.h"
 

+#include "wx/window.h"
+

 #ifndef WX_PRECOMP
     #define INCL_DOS
     #define INCL_PM
     #include <os2.h>
 #ifndef WX_PRECOMP
     #define INCL_DOS
     #define INCL_PM
     #include <os2.h>

-    #include "wx/window.h"

     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"


@@ -44,6 +45,7 @@
     #include "wx/toolbar.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/toolbar.h"
     #include "wx/settings.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

     #include <stdio.h>
 #endif
 
     #include <stdio.h>
 #endif
 


@@ -56,7 +58,6 @@
 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 


@@ -72,8 +73,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

-#include "wx/log.h"
-

 
 #include "wx/textctrl.h"
 
 
 #include "wx/textctrl.h"
 

diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index ae71f142b8d18bcab6c390cc8f2cf29dfefdff15..b24f6d23f524d09af0c202da893ec276a8b6a6a7 100644 (file)
--- a/src/palmos/bitmap.cpp
+++ b/src/palmos/bitmap.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/bitmap.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -32,12 +34,10 @@
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"

-    #include "wx/bitmap.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif

diff --git a/src/palmos/clipbrd.cpp b/src/palmos/clipbrd.cpp
index 8cc26b6813c389f4aa46a3b6d8ee69276d7c442f..a60d984fd14f27a6c59a34757af5ed39d634bc39 100644 (file)
--- a/src/palmos/clipbrd.cpp
+++ b/src/palmos/clipbrd.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/event.h"


@@ -34,15 +36,13 @@
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 
 #endif
 
 #if wxUSE_METAFILE
     #include "wx/metafile.h"
 #endif
 

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

 #include <string.h>
 
 #include "wx/palmos/private.h"
 #include <string.h>
 
 #include "wx/palmos/private.h"

diff --git a/src/palmos/dcclient.cpp b/src/palmos/dcclient.cpp
index 8a07a7b2ce37a6e483e53a32f53c2222ad27ce14..1269dcb5869320dced94a6480a764f01259e5e4e 100644 (file)
--- a/src/palmos/dcclient.cpp
+++ b/src/palmos/dcclient.cpp
@@ -28,9 +28,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

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

diff --git a/src/palmos/dialog.cpp b/src/palmos/dialog.cpp
index 4538f533ec0d61e10599ea3a64d5a2356406f8ee..248a539145ff384f78ee2ac78b0f9fd3409f970c 100644 (file)
--- a/src/palmos/dialog.cpp
+++ b/src/palmos/dialog.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dialog.h"

     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"


@@ -34,7 +35,6 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 

diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp
index 06340720e18658b50d44a0508c0e24bfaf5fe9ee..67688416f82601d751d538c89a153362c27aeacd 100644 (file)
--- a/src/palmos/dragimag.cpp
+++ b/src/palmos/dragimag.cpp
@@ -34,9 +34,9 @@
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/frame.h"
 #include "wx/image.h"
 
 #include "wx/frame.h"
 #include "wx/image.h"
 

diff --git a/src/palmos/fontdlg.cpp b/src/palmos/fontdlg.cpp
index e6c238f90ee30ec9610918dea2e29724ad4ff724..2b494dc2e0450582c480e691451eb973a00c08f8 100644 (file)
--- a/src/palmos/fontdlg.cpp
+++ b/src/palmos/fontdlg.cpp
@@ -26,17 +26,18 @@
 
 #if wxUSE_FONTDLG
 
 
 #if wxUSE_FONTDLG
 

+#include "wx/fontdlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"

 #include "wx/palmos/private.h"
 
 #include "wx/cmndata.h"
 #include "wx/palmos/private.h"
 
 #include "wx/cmndata.h"

-#include "wx/log.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp
index c660adb68e2d1b815d8988ccf624fd668b93bf95..8d2f51ee16d44f6690f31ab4d17861e34afffecf 100644 (file)
--- a/src/palmos/frame.cpp
+++ b/src/palmos/frame.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"

     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"


@@ -34,6 +35,7 @@
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #if wxUSE_STATUSBAR
 #endif // WX_PRECOMP
 
 #if wxUSE_STATUSBAR


@@ -46,7 +48,6 @@
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"
 #endif // wxUSE_TOOLBAR
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"

diff --git a/src/palmos/imaglist.cpp b/src/palmos/imaglist.cpp
index 1a8d5c5df9acb80d579d1c93b16109c804b827b2..1616e05e2d6f72854b6e781ceabb514db9591a23 100644 (file)
--- a/src/palmos/imaglist.cpp
+++ b/src/palmos/imaglist.cpp
@@ -31,10 +31,9 @@
     #include "wx/string.h"
     #include "wx/dcmemory.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #include "wx/palmos/imaglist.h"
 #include "wx/palmos/private.h"
 
 #include "wx/palmos/imaglist.h"
 #include "wx/palmos/private.h"
 

diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp
index a1655ba2ec1f93f8367edc8fdc624644252beb4c..6876e0668f0f65df0ddfb9b2fb9bd21776453fac 100644 (file)
--- a/src/palmos/listbox.cpp
+++ b/src/palmos/listbox.cpp
@@ -18,21 +18,21 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

-    #include "wx/listbox.h"

     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"
     #include "wx/dc.h"
     #include "wx/utils.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/palmos/private.h"
 
 #endif
 
 #include "wx/window.h"
 #include "wx/palmos/private.h"
 

-#include "wx/log.h"
-

 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif

diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp
index bc01bac3d4c30d2436276b179830da9c7cfbaeb5..f0dc626bdd1eb7852a6f1f3f2e305fdf28814818 100644 (file)
--- a/src/palmos/menuitem.cpp
+++ b/src/palmos/menuitem.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+#include "wx/menu.h"
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"


@@ -33,12 +35,11 @@
     #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"

-    #include "wx/menu.h"

     #include "wx/string.h"
     #include "wx/string.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 
 #if wxUSE_ACCEL
     #include "wx/accel.h"

diff --git a/src/palmos/printpalm.cpp b/src/palmos/printpalm.cpp
index 1ff991aa299fa3c7e40535eba24f1708691a461e..747c6c16fbdd6b625dbb860116485056fd46839a 100644 (file)
--- a/src/palmos/printpalm.cpp
+++ b/src/palmos/printpalm.cpp
@@ -36,12 +36,12 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/palmos/printpalm.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/palmos/printpalm.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"

-#include "wx/log.h"

 #include "wx/palmos/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/palmos/private.h"
 
 // ---------------------------------------------------------------------------

diff --git a/src/palmos/statbrpalm.cpp b/src/palmos/statbrpalm.cpp
index ec0cdb90480c65031ff2e410d639b888b9018886..679433f1b9940cca61deb2fa97c09693ec7df472 100644 (file)
--- a/src/palmos/statbrpalm.cpp
+++ b/src/palmos/statbrpalm.cpp
@@ -25,10 +25,9 @@
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-

 #include <StatusBar.h>
 
 // ----------------------------------------------------------------------------
 #include <StatusBar.h>
 
 // ----------------------------------------------------------------------------

diff --git a/src/palmos/statline.cpp b/src/palmos/statline.cpp
index 8af952e43129d6ac9d38cfb6b61472e016636f44..eeed178c84605cc9b2538eed1cb1d1aca8d67a8b 100644 (file)
--- a/src/palmos/statline.cpp
+++ b/src/palmos/statline.cpp
@@ -24,12 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 
 #include "wx/statline.h"
 

-#if wxUSE_STATLINE
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/palmos/private.h"
 
 #include "wx/palmos/private.h"

-#include "wx/log.h"

 
 #ifndef SS_SUNKEN
     #define SS_SUNKEN 0x00001000L
 
 #ifndef SS_SUNKEN
     #define SS_SUNKEN 0x00001000L


@@ -119,4 +122,3 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 #endif // wxUSE_STATLINE
 }
 
 #endif // wxUSE_STATLINE

-

diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index f8aa33d8a997cb75b1e5295838372f43c1fcb905..45246666e24cb4aed3bc0ce4a18a3b8ad865f709 100644 (file)
--- a/src/palmos/treectrl.cpp
+++ b/src/palmos/treectrl.cpp
@@ -26,14 +26,16 @@
 
 #if wxUSE_TREECTRL
 
 
 #if wxUSE_TREECTRL
 

+#include "wx/treectrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/palmos/private.h"
 
 #include "wx/app.h"
 #endif
 
 #include "wx/palmos/private.h"
 
 #include "wx/app.h"

-#include "wx/log.h"

 #include "wx/imaglist.h"
 #include "wx/settings.h"
 
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index 39f2c7019b55658a3b0c63fc4e0232ed0cfedc8e..f87ff65b7fc9b364fc4939444f25432ca2b1642e 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/window.h"

     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"


@@ -42,6 +43,7 @@
     #include "wx/settings.h"
     #include "wx/statbox.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/statbox.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)


@@ -59,7 +61,6 @@
 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/log.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -73,8 +74,6 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 

-#include "wx/log.h"
-

 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 6f13810965d9ae7a40f9a96f9cbe2aaa373f4fbe..5a803f20a0bb74570a65a41f30e305da6741678a 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/ctrlrend.cpp
+// Name:        src/univ/ctrlrend.cpp

 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -31,17 +31,17 @@
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/image.h"

-#include "wx/log.h"

 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
 #if wxUSE_GAUGE
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
 #if wxUSE_GAUGE

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

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 7cdc4e967645bcf17de09486cfc804997d33350a..1acda8478341390b4dcb30462c30018f05818e4d 100644 (file)
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -25,12 +25,13 @@
 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/timer.h"
 #ifndef WX_PRECOMP
     #include "wx/timer.h"

-

     #include "wx/dcclient.h"
     #include "wx/dcclient.h"

-    #include "wx/scrolbar.h"

     #include "wx/validate.h"
     #include "wx/validate.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/univ/scrtimer.h"
 #endif
 
 #include "wx/univ/scrtimer.h"


@@ -38,7 +39,6 @@
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"

-#include "wx/log.h"

 
 #define WXDEBUG_SCROLLBAR
 
 
 #define WXDEBUG_SCROLLBAR
 

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 66e6b2162339b7b6289de47e4ba525c071fc0ec1..a284182dd50cdff8f90db35b7b5ac7b555fefd36 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -27,17 +27,18 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/univ/renderer.h"
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/univ/renderer.h"
 
 #include "wx/frame.h"

-#include "wx/toolbar.h"

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

-#include "wx/log.h"

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


@@ -649,14 +650,14 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
         PerformAction( wxACTION_BUTTON_RELEASE, numArg );
 
         PerformAction( wxACTION_BUTTON_CLICK, numArg );
         PerformAction( wxACTION_BUTTON_RELEASE, numArg );
 
         PerformAction( wxACTION_BUTTON_CLICK, numArg );

-                        
-        // Write by Danny Raynor to change state again.                
+
+        // Write by Danny Raynor to change state again.

         // Check button still pressed or not
         if( tool->IsInverted() )
         // Check button still pressed or not
         if( tool->IsInverted() )

-        {        
-            PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );      
+        {
+            PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );

         }
         }

-    
+

         // Set mouse leave toolbar button range (If still in the range,
         // toolbar button would get focus again
         PerformAction( wxACTION_TOOLBAR_LEAVE, numArg );
         // Set mouse leave toolbar button range (If still in the range,
         // toolbar button would get focus again
         PerformAction( wxACTION_TOOLBAR_LEAVE, numArg );


@@ -882,4 +883,3 @@ bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR

-

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 4892f9d8eb07b6e177d50c93ba448b0ce88fb4a7..bfcc9870fb2b2364a4bd293b4e938a69af65ba8d 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/window.cpp
+// Name:        src/univ/window.cpp

 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -24,18 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+

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

-    #include "wx/window.h"

     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
     #include "wx/frame.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"


@@ -1364,4 +1365,3 @@ WXLRESULT wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
 }
 
 #endif // __WXMSW__
 }
 
 #endif // __WXMSW__

-

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 2b39c34e0b8ce37a100c38ea22c271ca24b17f2c..db1ad16b3b107b815deb73c9d1f8184ddd82f4de 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -19,13 +19,13 @@
 #ifndef  WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef  WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif // !PCH
 
 #include "wx/event.h"
 #include "wx/timer.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 #endif // !PCH
 
 #include "wx/event.h"
 #include "wx/timer.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/app.h"
 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/app.h"

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 53dba8c959e6f1ae9be6294a1fedb7b0a516e144..1d71c7f038d8238d98f9b2fc6e1ccae40230b325 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -34,10 +34,10 @@
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif /* WX_PRECOMP */
 
 #include "wx/display_impl.h"
 #endif /* WX_PRECOMP */
 
 #include "wx/display_impl.h"

-#include "wx/log.h"

 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 3edabd669f0c273e67c541e8adcadc68647fe9d8..3aa6a5a3451eea2a50b3ca7a66689a83dfda2cd6 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -12,10 +12,10 @@
 // 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/mediactrl.h"
-

 #if wxUSE_MEDIACTRL
 
 #if wxUSE_MEDIACTRL
 

+#include "wx/mediactrl.h"
+

 #if wxUSE_GSTREAMER
 
 #include <gst/gst.h>                // main gstreamer header
 #if wxUSE_GSTREAMER
 
 #include <gst/gst.h>                // main gstreamer header


@@ -28,7 +28,10 @@
 #   include <gst/gconf/gconf.h>        // gstreamer glib configuration
 #endif
 
 #   include <gst/gconf/gconf.h>        // gstreamer glib configuration
 #endif
 

-#include "wx/log.h"                 // wxLogDebug/wxLogSysError/wxLogTrace
+#ifndef  WX_PRECOMP
+    #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace
+#endif
+

 #include "wx/app.h"                 // wxTheApp->argc, wxTheApp->argv
 #include "wx/thread.h"              // wxMutex/wxMutexLocker
 #include "wx/timer.h"               // wxTimer
 #include "wx/app.h"                 // wxTheApp->argc, wxTheApp->argv
 #include "wx/thread.h"              // wxMutex/wxMutexLocker
 #include "wx/timer.h"               // wxTimer


@@ -1033,7 +1036,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
         if(error)
         {
             wxLogSysError(wxT("Could not initialize GStreamer\n")
         if(error)
         {
             wxLogSysError(wxT("Could not initialize GStreamer\n")

-                          wxT("Error Message:%s"), 
+                          wxT("Error Message:%s"),

                           (const wxChar*) wxConvUTF8.cMB2WX(error->message)
                          );
             g_error_free(error);
                           (const wxChar*) wxConvUTF8.cMB2WX(error->message)
                          );
             g_error_free(error);


@@ -1051,7 +1054,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 
 #ifdef __WXGTK__
     // We handle our own GTK expose events
 
 #ifdef __WXGTK__
     // We handle our own GTK expose events

-    m_ctrl->m_noExpose = TRUE;
+    m_ctrl->m_noExpose = true;

 #endif
 
     if( !m_ctrl->wxControl::Create(parent, id, pos, size,
 #endif
 
     if( !m_ctrl->wxControl::Create(parent, id, pos, size,


@@ -1196,11 +1199,11 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location)
 
         //Workaround GstURI leading "//" problem and make sure it leads
         //with that
 
         //Workaround GstURI leading "//" problem and make sure it leads
         //with that

-        return DoLoad(wxString(wxT("file://")) + 
-                      uristring.Right(uristring.Length() - 5)
+        return DoLoad(wxString(wxT("file://")) +
+                      uristring.Right(uristring.length() - 5)

                      );
     }
                      );
     }

-    else 
+    else

         return DoLoad(location.BuildURI());
 }
 
         return DoLoad(location.BuildURI());
 }
 


@@ -1357,7 +1360,7 @@ wxMediaState wxGStreamerMediaBackend::GetState()
 // NB: whether we have paused or not and keep track of the time after the
 // NB: pause and whenever the user seeks while paused
 // NB:
 // NB: whether we have paused or not and keep track of the time after the
 // NB: pause and whenever the user seeks while paused
 // NB:

-// 
+//

 // THREAD-UNSAFE, at least if not paused. Requires media to be at least paused.
 //-----------------------------------------------------------------------------
 wxLongLong wxGStreamerMediaBackend::GetPosition()
 // THREAD-UNSAFE, at least if not paused. Requires media to be at least paused.
 //-----------------------------------------------------------------------------
 wxLongLong wxGStreamerMediaBackend::GetPosition()

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index ab1cd8db14baa218ebf1a0d5349a68544648041d..5b108a67336e5977b427f9df7de023266cf3ed38 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -44,9 +44,9 @@
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/confbase.h"
 
 #include "wx/file.h"
 #include "wx/confbase.h"
 

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 10373179fb176216fabacdfe1eb36e73ff1706a9..b6ec00f160e4c20b0333e82af209e8b2aa9c4223 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -22,12 +22,16 @@
 #include "wx/wxprec.h"
 
 #include "wx/taskbar.h"
 #include "wx/wxprec.h"
 
 #include "wx/taskbar.h"

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

 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/dcclient.h"

-#include "wx/log.h"

 #include "wx/image.h"
 
 #ifdef __VMS
 #include "wx/image.h"
 
 #ifdef __VMS

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 503b0862149bca9f55f3a8b33f70bc8bebd17d60..6d2db0b9567be6a2abce01d1f61227688747fb97 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -31,11 +31,11 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/module.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 #include "wx/timer.h"
 #include "wx/stopwatch.h"
 
 #include "wx/timer.h"
 #include "wx/stopwatch.h"
 

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 869ae2b5550653bf9a126347a1270d9177669a77..4315f74546dce71d211a2f3b55e8e57308b9e16e 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -23,9 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"

 #include "wx/app.h"
 #include "wx/apptrait.h"
 
 #include "wx/app.h"
 #include "wx/apptrait.h"
 

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index b07ce1599133370cd0aae33ccc67dcb1b6eb5664..a410c64770d3ade1e5db34c1a48e80ea891dc6f2 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -15,10 +15,14 @@
 #include "wx/wxprec.h"
 
 #include "wx/unix/utilsx11.h"
 #include "wx/wxprec.h"
 
 #include "wx/unix/utilsx11.h"

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

 #include "wx/iconbndl.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/iconbndl.h"
 #include "wx/image.h"
 #include "wx/icon.h"

-#include "wx/log.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 
 #ifdef __VMS
 #pragma message disable nosimpint

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index cbdac795e754a292d8d5f4055ec68eb47893b5dd..8215157322104eec7ee95254184f19f0bf441d2b 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -17,6 +17,7 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"

+    #include "wx/log.h"

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


@@ -24,10 +25,8 @@
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

-#include "wx/log.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/module.h"
 #include "wx/memory.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/filename.h"
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/filename.h"

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 811f226b93c91512ddfe977dcf88e442a61f7af3..d3709d73d98dfe80e7a7390f2d98dfa8a14e4421 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -13,8 +13,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"

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

 #include "wx/icon.h"
 #include "wx/icon.h"

-#include "wx/log.h"

 #include "wx/image.h"
 #include "wx/app.h"
 #if wxUSE_NANOX
 #include "wx/image.h"
 #include "wx/app.h"
 #if wxUSE_NANOX

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index ee100b5bcf093cc145687925c7f8799e9dd4af54..479e96dff7355323f564fbe1430e9c8c85d2cffb 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -1,20 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        src/x11/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Author:      Robert Roebling
 // Purpose:     Clipboard functionality
 // Author:      Robert Roebling

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/clipbrd.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/clipbrd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

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

-#include "wx/log.h"

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -108,7 +114,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
             if (format == clipboard->m_targetRequested)
             {
                 clipboard->m_waiting = FALSE;
             if (format == clipboard->m_targetRequested)
             {
                 clipboard->m_waiting = FALSE;

-                clipboard->m_formatSupported = TRUE;
+                clipboard->m_formatSupported = true;

                 return;
             }
         }
                 return;
             }
         }


@@ -168,7 +174,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 
 
     data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
 

-    wxTheClipboard->m_formatSupported = TRUE;
+    wxTheClipboard->m_formatSupported = true;

     clipboard->m_waiting = FALSE;
 }
 
     clipboard->m_waiting = FALSE;
 }
 


@@ -292,7 +298,7 @@ wxClipboard::wxClipboard()
     if (!g_clipboardAtom) g_clipboardAtom = XInternAtom( (Display*) wxGetDisplay(), "CLIPBOARD", False );
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
 #endif
     if (!g_clipboardAtom) g_clipboardAtom = XInternAtom( (Display*) wxGetDisplay(), "CLIPBOARD", False );
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
 #endif

-    
+

     m_formatSupported = FALSE;
     m_targetRequested = 0;
 
     m_formatSupported = FALSE;
     m_targetRequested = 0;
 


@@ -320,7 +326,7 @@ void wxClipboard::Clear()
 #if 0
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
 #if 0
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
                                      (guint32) GDK_CURRENT_TIME );


@@ -330,7 +336,7 @@ void wxClipboard::Clear()
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
 
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {

-            m_waiting = TRUE;
+            m_waiting = true;

 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );
 
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
                                      (guint32) GDK_CURRENT_TIME );


@@ -351,16 +357,16 @@ void wxClipboard::Clear()
     }
 
     m_targetRequested = 0;
     }
 
     m_targetRequested = 0;

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );

 
 

-    m_open = TRUE;
+    m_open = true;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 }
 
 bool wxClipboard::SetData( wxDataObject *data )


@@ -462,7 +468,7 @@ bool wxClipboard::IsOpened() const
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */

-    if (m_waiting) return FALSE;
+    if (m_waiting) return false;

 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;


@@ -473,19 +479,19 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
                 format.GetId().c_str() );
 #endif
 
                 format.GetId().c_str() );
 #endif
 

-    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-    m_formatSupported = FALSE;
+    m_formatSupported = false;

 
     /* perform query. this will set m_formatSupported to
 
     /* perform query. this will set m_formatSupported to

-       TRUE if m_targetRequested is supported.
+       true if m_targetRequested is supported.

        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.
        also, we have to wait for the "answer" from the
        clipboard owner which is an asynchronous process.

-       therefore we set m_waiting = TRUE here and wait
+       therefore we set m_waiting = true here and wait

        until the callback "targets_selection_received"
        until the callback "targets_selection_received"

-       sets it to FALSE */
+       sets it to false */

 
 

-    m_waiting = TRUE;
+    m_waiting = true;

 
 #if 0
     gtk_selection_convert( m_targetsWidget,
 
 #if 0
     gtk_selection_convert( m_targetsWidget,


@@ -497,14 +503,14 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
     while (m_waiting) gtk_main_iteration();
 #endif
 
     while (m_waiting) gtk_main_iteration();
 #endif
 

-    if (!m_formatSupported) return FALSE;
+    if (!m_formatSupported) return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {

-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );

 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
 
     /* get formats from wxDataObjects */
     wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];


@@ -523,19 +529,19 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
 

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
        /* perform query. this will set m_formatSupported to
 
        /* perform query. this will set m_formatSupported to

-          TRUE if m_targetRequested is supported.
+          true if m_targetRequested is supported.

           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.
           also, we have to wait for the "answer" from the
           clipboard owner which is an asynchronous process.

-          therefore we set m_waiting = TRUE here and wait
+          therefore we set m_waiting = true here and wait

           until the callback "targets_selection_received"
           sets it to FALSE */
 
           until the callback "targets_selection_received"
           sets it to FALSE */
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
 #if 0
         gtk_selection_convert( m_targetsWidget,
 
 #if 0
         gtk_selection_convert( m_targetsWidget,


@@ -555,21 +561,21 @@ bool wxClipboard::GetData( wxDataObject& data )
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 
         /* store requested format to be asked for by callbacks */
         m_targetRequested = format;
 

-        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );

 
         /* start query */
 
         /* start query */

-        m_formatSupported = FALSE;
+        m_formatSupported = false;

 
         /* ask for clipboard contents.  this will set
 
         /* ask for clipboard contents.  this will set

-           m_formatSupported to TRUE if m_targetRequested
+           m_formatSupported to true if m_targetRequested

            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.
            is supported.
            also, we have to wait for the "answer" from the
            clipboard owner which is an asynchronous process.

-           therefore we set m_waiting = TRUE here and wait
+           therefore we set m_waiting = true here and wait

            until the callback "targets_selection_received"
            until the callback "targets_selection_received"

-           sets it to FALSE */
+           sets it to false */

 
 

-        m_waiting = TRUE;
+        m_waiting = true;

 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );
 
         wxLogTrace( TRACE_CLIPBOARD,
                     wxT("wxClipboard::GetData: format found, start convert") );


@@ -589,7 +595,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         /* return success */
         delete[] array;
 
         /* return success */
         delete[] array;

-        return TRUE;
+        return true;

     }
 
     wxLogTrace( TRACE_CLIPBOARD,
     }
 
     wxLogTrace( TRACE_CLIPBOARD,


@@ -597,9 +603,8 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     /* return failure */
     delete[] array;
 
     /* return failure */
     delete[] array;

-    return FALSE;
+    return false;

 }
 
 #endif
   // wxUSE_CLIPBOARD
 }
 
 #endif
   // wxUSE_CLIPBOARD

-

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 4fee19a52756f6b2d9c5da54d8358679beaf1faa..bd4b3defcc0505143a7ff167588523de8657cac5 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -13,10 +13,14 @@
 #if wxUSE_DATAOBJ
 
 #include "wx/dataobj.h"
 #if wxUSE_DATAOBJ
 
 #include "wx/dataobj.h"

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

 #include "wx/mstream.h"
 #include "wx/app.h"
 #include "wx/image.h"
 #include "wx/mstream.h"
 #include "wx/app.h"
 #include "wx/image.h"

-#include "wx/log.h"

 
 #include "wx/utils.h"
 #include "wx/x11/private.h"
 
 #include "wx/utils.h"
 #include "wx/x11/private.h"

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 7589082fc59dd0c57b41752fe2b56740aa608044..b49f27f66fbef5f5e62b81738faf0b2abc60b697 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -20,13 +20,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/log.h"

 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 9ab1474b9cbd6e76c7bfe07f781a1f9de5c8b100..1ecdd96f84c19fd13475138e8ae34c9d8fbe4e6b 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -20,9 +20,13 @@
 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"
 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"

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

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

-#include "wx/log.h"

 
 #ifdef __VMS
 # pragma message disable nosimpint
 
 #ifdef __VMS
 # pragma message disable nosimpint

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 125130fcd262fad23fba9d1605abf088695123cf..c0c7825226e5050506986984ef50d1014fb44160 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -12,9 +12,12 @@
 
 #if wxUSE_POPUPWIN
 
 
 #if wxUSE_POPUPWIN
 

-#include "wx/log.h"
-

 #include "wx/popupwin.h"
 #include "wx/popupwin.h"

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

 #include "wx/app.h"
 #include "wx/settings.h"
 
 #include "wx/app.h"
 #include "wx/settings.h"
 

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 518af38e74ea3a0af621a786e462916f2573fe98..dd487ea50f016165982461f5107e5f500cef7c30 100644 (file)
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/region.h"
 #include "wx/wxprec.h"
 
 #include "wx/region.h"

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

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

-#include "wx/log.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index 4d0cb919a974a5519a2e9b0b82a928a6ddfcc9af..be8dbe53248007d6c50fd0ce7210282a66ec0118 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -27,8 +27,12 @@
 #if !wxUSE_NANOX
 
 #include "wx/x11/reparent.h"
 #if !wxUSE_NANOX
 
 #include "wx/x11/reparent.h"

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

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/log.h"

 #include "wx/app.h"
 #include "wx/timer.h"
 
 #include "wx/app.h"
 #include "wx/timer.h"
 


@@ -284,4 +288,4 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
     } return (WXWindow) result;
 }
 
     } return (WXWindow) result;
 }
 

-#endif
+#endif // !wxUSE_NANOX

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index fc3a12b2fbf369162e618f21e2fa97730d207814..96d2ea1e5eccb3c0cd4263d90d1258f7d2628675 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -14,10 +14,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/clipbrd.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/clipbrd.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 6409d158f5e6401a81ecab7e6ca1b48580661186..dccd24f2e92d180f0c6226e66625f2b8839e35a6 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -16,10 +16,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/hash.h"
-#endif
-

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


@@ -28,6 +24,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"


@@ -45,7 +48,6 @@
 #include "wx/scrolbar.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/scrolbar.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/fontutil.h"
 #include "wx/univ/renderer.h"
 

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index cd33a3a68eba206fb1f957b256c0b53442dc099c..28b83e829b4afc33432ce7d17f0b2b756ef9d4b7 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -21,12 +21,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 #endif
 
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"

-#include "wx/log.h"

 #include "wx/strconv.h"
 
 #include "expat.h" // from Expat
 #include "wx/strconv.h"
 
 #include "expat.h" // from Expat

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index c72b37c77ac2ef6ffc1cdc15a6cd98fd79492cd3..067f3cf7c09555659513686d7c771aa4ed73ddd1 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -21,10 +21,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index 48a00b3044464919dfba318813b55576aff2a463..871332f8df8db9d44a9ffb9d926a075bd5f1deb5 100644 (file)
--- a/src/xrc/xh_choicbk.cpp
+++ b/src/xrc/xh_choicbk.cpp
@@ -19,7 +19,10 @@
 
 #include "wx/xrc/xh_choicbk.h"
 
 
 #include "wx/xrc/xh_choicbk.h"
 

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

 #include "wx/choicebk.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"
 #include "wx/choicebk.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index c75f55019a5b018d1662197c2b4caf035ffe502f..95a930b86cc0ef3634161dc90e0b1dec436bec74 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -21,11 +21,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #endif
 
 #include "wx/dialog.h"
 #include "wx/frame.h"

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index dc6d8fc2988a6b4632ea099e48e24ead1521446b..5e6e91995cd9ac850726153e27c2b49d761551a3 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -21,11 +21,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/frame.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #endif
 
 #include "wx/frame.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index c0d9742a6a77219811d034251871afe79babf43a..f75ae9f8835a59d58323468a510ef85d7a57d32a 100644 (file)
--- a/src/xrc/xh_listbk.cpp
+++ b/src/xrc/xh_listbk.cpp
@@ -19,7 +19,10 @@
 
 #include "wx/xrc/xh_listbk.h"
 
 
 #include "wx/xrc/xh_listbk.h"
 

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

 #include "wx/listbook.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"
 #include "wx/listbook.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 9cb9ee2e7c2a2055f9c6d78d7bd54e32b1a40131..35c9cae13ad159eedb3e328852e30f89d203dff2 100644 (file)
--- a/src/xrc/xh_mdi.cpp
+++ b/src/xrc/xh_mdi.cpp
@@ -21,11 +21,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/mdi.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #endif
 
 #include "wx/mdi.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 15efb8fca06e3ba6faa92b25678b37e8c38d5a0b..0c7df45439f6d27ac737d74a0636065250edc2eb 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -19,7 +19,10 @@
 
 #include "wx/xrc/xh_notbk.h"
 
 
 #include "wx/xrc/xh_notbk.h"
 

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

 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 3d059fbf443726c59a30eb0ec719c75addac31a1..8d6d219261edeab9bf5bdca44c65a8321e4efcf8 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -18,9 +18,13 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_sizer.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_sizer.h"

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

 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"

-#include "wx/log.h"

 #include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/panel.h"
 #include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/panel.h"

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index f9e89a36bdc5ec0bd38da43a73a8037448aae5a2..f1dc8312461ab513580ddb88cf9abe5c9ac9fa41 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -18,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_split.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_split.h"

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

 #include "wx/splitter.h"
 #include "wx/splitter.h"

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index c49c0c33a4a26852fe7e471b0508f3a5f5b5256c..a678ea94951adcd0555daad086af19787cc08f33 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -21,11 +21,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/log.h"

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

-#include "wx/log.h"
-

 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)

diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index b2394c6dcf76e57b493bda605f4681d581f443ba..8f2fdaedf36813d98afbdcde7c41c83fb4bec9c2 100644 (file)
--- a/src/xrc/xh_treebk.cpp
+++ b/src/xrc/xh_treebk.cpp
@@ -19,9 +19,12 @@
 
 #include "wx/xrc/xh_treebk.h"
 
 
 #include "wx/xrc/xh_treebk.h"
 

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

 #include "wx/treebook.h"
 #include "wx/imaglist.h"
 #include "wx/treebook.h"
 #include "wx/imaglist.h"

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index c60fd51170906949a7b484114ce8ec79466b1338..a7b7beaf44188bcff0ad2e4477ccf38cb67de83b 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_unkwn.cpp
+// Name:        src/xrc/xh_unkwn.cpp

 // Purpose:     XRC resource for unknown widget
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // Purpose:     XRC resource for unknown widget
 // Author:      Vaclav Slavik
 // Created:     2000/09/09


@@ -18,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_unkwn.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_unkwn.h"

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

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

-#include "wx/log.h"

 #include "wx/sizer.h"
 #include "wx/panel.h"
 
 #include "wx/sizer.h"
 #include "wx/panel.h"
 

diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index fd49ef89f75b0ad4f9e723c97d74ea905c5dc2ff..6efb06635a50f5d16397091b547e1b8ba86d3a87 100644 (file)
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_wizrd.cpp
+// Name:        src/xrc/xh_wizrd.cpp

 // Purpose:     XRC resource for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/01
 // Purpose:     XRC resource for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/01


@@ -18,7 +18,11 @@
 #if wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"
 #if wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"

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

 #include "wx/wizard.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler)
 #include "wx/wizard.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler)

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 3b4ddb5fb613d5ca56666e6cb19afa77b40a4926..ea902a5407763cb467c002890556dba5897765f8 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/log.h"

 #endif
 
 #ifndef __WXWINCE__
 #endif
 
 #ifndef __WXWINCE__


@@ -33,7 +34,6 @@
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"

-#include "wx/log.h"

 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"