Include wx/list.h according to precompiled headers of wx/wx.h (with other minor clean...

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 5a6a35127ef3c810fed2c9e48d24e519116a38be..efc2c45cbdd055868d09595d805eeff3bbf23ebe 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/base/appbase.cpp
+// Name:        src/common/appbase.cpp

 // Purpose:     implements wxAppConsole class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements wxAppConsole class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,9 +25,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/list.h"

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

-    #include "wx/list.h"

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


@@ -269,7 +269,7 @@ void wxAppConsole::ProcessPendingEvents()
     if ( !wxPendingEventsLocker )
         return;
 #endif
     if ( !wxPendingEventsLocker )
         return;
 #endif

-    
+

     // ensure that we're the only thread to modify the pending events list
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
     // ensure that we're the only thread to modify the pending events list
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 


@@ -289,7 +289,7 @@ void wxAppConsole::ProcessPendingEvents()
         // In ProcessPendingEvents(), new handlers might be add
         // and we can safely leave the critical section here.
         wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
         // In ProcessPendingEvents(), new handlers might be add
         // and we can safely leave the critical section here.
         wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

-        
+

         handler->ProcessPendingEvents();
 
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
         handler->ProcessPendingEvents();
 
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );


@@ -839,4 +839,3 @@ void ShowAssertDialog(const wxChar *szFile,
 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__

-

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index d78a126972be518ffeffc3d7acf83263eff519c4..fe6e9038106dd9520a8ed3f8f26a25fbde022316 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -25,10 +25,10 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/list.h"

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

-    #include "wx/list.h"

     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bitmap.h"

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 2e8a1df31c826bb25ec9e3c0e6cd249d3f0a3b59..5d3ab8655e922548c1e64adcb0f83720e17879fd 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxArtProvider class
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxArtProvider class
 // Author:      Vaclav Slavik
 // Modified by:


@@ -21,15 +21,16 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/log.h"

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

+    #include "wx/log.h"

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

+

 #if wxUSE_IMAGE
 #if wxUSE_IMAGE

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

 #endif
 
 // ===========================================================================
 #endif
 
 // ===========================================================================


@@ -240,7 +241,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     else if (client == wxART_BUTTON)
         return wxSize(16, 15);
     else // wxART_OTHER or perhaps a user's client, no specified size
     else if (client == wxART_BUTTON)
         return wxSize(16, 15);
     else // wxART_OTHER or perhaps a user's client, no specified size

-        return wxDefaultSize;      
+        return wxDefaultSize;

 #endif // GTK+ 2/else
 }
 
 #endif // GTK+ 2/else
 }
 

diff --git a/src/common/db.cpp b/src/common/db.cpp
index b9b113d621df5b87ad08c12a46c79e84feb2282a..923ee6a374ccfd4964c6be16e74de520a1fbaf4e 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -31,8 +31,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

-    #include "wx/string.h"

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

+    #include "wx/string.h"

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 80313ac708c76a855c9041a670b4bce5bd29e153..346dcd34f9d09b01ad5ffc854f8351134d66edc4 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -21,8 +21,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

-    #include "wx/string.h"

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

+    #include "wx/string.h"

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 22fc22e499f1873eac18f512db9625da039a577e..3e1167c0f0aeb41ef7d36f6079f266bbb1577647 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -21,19 +21,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP

+    #include "wx/list.h"

     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/dialog.h"
     #include "wx/menu.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/dialog.h"
     #include "wx/menu.h"

-    #include "wx/list.h"

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


@@ -50,8 +50,8 @@
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE

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

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


@@ -66,14 +66,14 @@
 #include <string.h>
 
 #if wxUSE_STD_IOSTREAM
 #include <string.h>
 
 #if wxUSE_STD_IOSTREAM

-  #include "wx/ioswrap.h"
-  #if wxUSE_IOSTREAMH
-    #include <fstream.h>
-  #else
-    #include <fstream>
-  #endif
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif

 #else
 #else

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

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/event.cpp b/src/common/event.cpp
index a4f85d7d61a962a5de7843cb4f4eb4fadfddbb54..e29dd4e6fb9bc7a8fe84962928e0af815b834597 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -25,8 +25,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/app.h"

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

+    #include "wx/app.h"

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

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index bc1a7583aaeaed8c920ea463de95462de9408a20..7c9ea3da690e276622ab97bbcf4414e02009ed60 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -21,11 +21,11 @@
 #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/list.h"
+    #include "wx/list.h"

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 21b13599b984d5ebbc6d06c0d144ed81ed18ea93..0581f926fce754a21200a69e0c08e8318ef9d37e 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -19,6 +19,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

+    #include "wx/list.h"

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


@@ -29,7 +30,6 @@
 #include "wx/module.h"
 
 #include "wx/hash.h"
 #include "wx/module.h"
 
 #include "wx/hash.h"

-#include "wx/list.h"

 
 //-----------------------------------------------------------------------------
 // wxPCXHandler
 
 //-----------------------------------------------------------------------------
 // wxPCXHandler

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 3bf910e4250f310939a074c9cf28b6cec592c79b..65f2fe726511259b567b42855c4954a8af280092 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:


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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_URL
 
 #endif
 
 #if wxUSE_URL
 

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

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

-#include "wx/list.h"

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


@@ -328,7 +331,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
             return;
 
         wxString hostname = tmp_str(0, pos),
             return;
 
         wxString hostname = tmp_str(0, pos),

-        port = tmp_str(pos+1, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.length()-pos);

         wxIPV4address addr;
 
         if (!addr.Hostname(hostname))
         wxIPV4address addr;
 
         if (!addr.Hostname(hostname))


@@ -371,7 +374,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             return;
 
         hostname = tmp_str(0, pos);
             return;
 
         hostname = tmp_str(0, pos);

-        port = tmp_str(pos+1, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.length()-pos);

 
         addr.Hostname(hostname);
         addr.Service(port);
 
         addr.Hostname(hostname);
         addr.Service(port);

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 79f840c25874096cc082210ce4daf688639cb817..04e166170d9afd69820157e0e885f74b974ae8ff 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -21,13 +21,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"

+    #include "wx/list.h"

     #include "wx/hash.h"
 #endif
 
 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
     #include "wx/hash.h"
 #endif
 
 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"

-#include "wx/list.h"

 #include <string.h>
 
 #include "wx/beforestd.h"
 #include <string.h>
 
 #include "wx/beforestd.h"

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index e19d33c09f0b200821f92779f884422d07d68006..f31532caa65fba5fb36568e77de762bb97911f50 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/accel.cpp
+// Name:        src/generic/accel.cpp

 // Purpose:     generic implementation of wxAcceleratorTable class
 // Author:      Robert Roebling
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove
 // Purpose:     generic implementation of wxAcceleratorTable class
 // Author:      Robert Roebling
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove


@@ -26,8 +26,8 @@
 #if wxUSE_ACCEL
 
 #ifndef WX_PRECOMP
 #if wxUSE_ACCEL
 
 #ifndef WX_PRECOMP

-    #include "wx/event.h"

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

+    #include "wx/event.h"

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


@@ -218,4 +218,3 @@ wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) c
 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL

-

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 455c0224c0f2ac843b5eee0b78245aa550ebaddb..7a8135133d5fc4c20dd8366ddf9d76d4ce517f65 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -18,9 +18,9 @@
 #if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
 
 #ifndef WX_PRECOMP
 #if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
 
 #ifndef WX_PRECOMP

+    #include "wx/list.h"

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

-    #include "wx/list.h"

     #include "wx/intl.h"
     #include "wx/msgdlg.h"
     #include "wx/choicdlg.h"
     #include "wx/intl.h"
     #include "wx/msgdlg.h"
     #include "wx/choicdlg.h"

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 45bdc9fec1e2d9cde774758a7ffcc3c1ef0fff53..3efcd634f91c472156dd1b2653beae194b875a79 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilres.cpp
+// Name:        src/gtk/utilsres.cpp

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


@@ -10,9 +10,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"
 

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

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

-#include "wx/list.h"

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


@@ -24,7 +27,7 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -60,7 +63,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -69,16 +72,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
     wxString result;
     if (conf.Read( entry, &result ))
     {
     wxString result;
     if (conf.Read( entry, &result ))
     {

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

         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )


@@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )


@@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )


@@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 }

-

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 45bdc9fec1e2d9cde774758a7ffcc3c1ef0fff53..76deb2b6be66356a6de6bf8729614cf020c80e32 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilres.cpp
+// Name:        src/gtk1/utilsres.cpp

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


@@ -10,9 +10,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"
 

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

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

-#include "wx/list.h"

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


@@ -24,7 +27,7 @@
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -60,7 +63,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );
 bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
 {
     wxString filename( file );

-    if (filename.IsEmpty()) filename = wxT(".wxWindows");
+    if (filename.empty()) filename = wxT(".wxWindows");

 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 
 
     wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
 


@@ -69,16 +72,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
     wxString result;
     if (conf.Read( entry, &result ))
     {
     wxString result;
     if (conf.Read( entry, &result ))
     {

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

         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;
         {
             wxChar *s = new wxChar[result.Len()+1];
             wxStrcpy( s, result.c_str() );
             *value = s;

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )


@@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;
     {
         *value = (float)wxStrtod(s, NULL);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )


@@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )


@@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;
     {
         *value = (int)wxStrtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 }

-

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9b5fc735fa7d8ade199274be8fb6ed23600bbd12..698e4cccb47aa0ea8d89896603046b9df48f3a78 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -16,6 +16,7 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP

+    #include "wx/list.h"

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


@@ -24,7 +25,6 @@
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"

-#include "wx/list.h"

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


@@ -1612,4 +1612,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 FORCE_WXHTML_MODULES()
 
 #endif // wxUSE_HTML
 FORCE_WXHTML_MODULES()
 
 #endif // wxUSE_HTML

-

diff --git a/src/mgl/gdiobj.cpp b/src/mgl/gdiobj.cpp
index fd2bd437793fff3a37a6773ca4b9849a68ec76b6..e23c754e93a9b2a1c8ec7d31a209eaa5e0747518 100644 (file)
--- a/src/mgl/gdiobj.cpp
+++ b/src/mgl/gdiobj.cpp
@@ -13,13 +13,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 5548cac50555c9bf4527a5406218b82bdc1725a4..37b680dd5426dd12831ed4a3374b5155aa8e3a55 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -12,13 +12,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

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

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

-#include "wx/list.h"

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

+

 #if wxUSE_IMAGE
 #if wxUSE_IMAGE

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

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index d1e489c88310f72b48ae9c47eb3de55d7fdefbdd..ebcaac16529ae4a744cd39442e198e1c821536b5 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/msw/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      Julian Smart
 // Modified by:

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index ab671b673bc31126903e16b2c42656f7a0a54c7f..447c88327bb8ad96c39c27648e743ef3c95d4e31 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -13,14 +13,14 @@
 #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 <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 2b028056152f7b65f17a6b3882799fb5ad3429f8..67f83d31f60f8186092138cca565b57807fb45b6 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 1ddd61e07f6cfba89a1702e7d434f84ef4953bed..d460b6a9b4a32d338df01a93506b2872020f69d8 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -13,15 +13,15 @@
 #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 <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/pen.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/pen.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index d93588c63728250d12f608a2219b2b9ee37d379e..fef9ff0dfccddfba8449361f0302949edd7019df 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/timer.cpp
+// Name:        src/msw/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)


@@ -19,8 +19,8 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP

-    #include "wx/window.h"

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

+    #include "wx/window.h"

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


@@ -162,4 +162,3 @@ wxTimerProc(HWND WXUNUSED(hwnd),
 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER

-

diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 79b0ae8919fc7270c701e10f75329c56d57f4528..891cdb6bc01596a55eff4c5be9c447d3f1b5de00 100644 (file)
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -18,6 +18,10 @@
 
 #if wxUSE_URL_NATIVE
 
 
 #if wxUSE_URL_NATIVE
 

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

 #if !wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 
 #if !wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 


@@ -60,7 +64,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
 #endif
 
 #include "wx/string.h"
 #endif
 
 #include "wx/string.h"

-#include "wx/list.h"

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 59451cffd2ce212bebb7acc941002c6971a1470d..f60d0f7c9b75e60e68bb6b5b656797f247b2acd5 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/os2/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      David Webster
 // Modified by:


@@ -27,7 +27,6 @@
 #include "wx/os2/private.h"
 #include "wx/log.h"
 
 #include "wx/os2/private.h"
 #include "wx/log.h"
 

-//#include "wx/msw/dib.h"

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


@@ -90,9 +89,7 @@ void wxBitmap::Init()
     //
 } // end of wxBitmap::Init
 
     //
 } // end of wxBitmap::Init
 

-bool wxBitmap::CopyFromIconOrCursor(
-  const wxGDIImage&                 rIcon
-)
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon)

 {
     HPOINTER                        hIcon = (HPOINTER)rIcon.GetHandle();
     POINTERINFO                     SIconInfo;
 {
     HPOINTER                        hIcon = (HPOINTER)rIcon.GetHandle();
     POINTERINFO                     SIconInfo;

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index acd9b7f57b15bad8f00fed31e9e2b2d6ecc6e7bf..d4a0a320dd8d64dd38e49e789392f94776b5c116 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -13,12 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/brush.h"
-#include "wx/log.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/brush.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -34,9 +34,7 @@ wxBrushRefData::wxBrushRefData()
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 

-wxBrushRefData::wxBrushRefData(
-  const wxBrushRefData&             rData
-)
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)

 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;
 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;


@@ -75,9 +73,7 @@ wxBrush::wxBrush(
     RealizeResource();
 } // end of wxBrush::wxBrush
 
     RealizeResource();
 } // end of wxBrush::wxBrush
 

-wxBrush::wxBrush(
-  const wxBitmap&                   rStipple
-)
+wxBrush::wxBrush(const wxBitmap& rStipple)

 {
     m_refData = new wxBrushRefData;
 
 {
     m_refData = new wxBrushRefData;
 

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index 2bb61ca2641323c64be845930d048a83c6434091..ebbb30b7411a2b29421a07bff0d11b7218cf4a7e 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -13,12 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/cursor.h"
+    #include "wx/icon.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 6c7507082ee8de543a29927704aa75bbcc0c8bc1..63be231df61c19c553b389cd7c63853cad724be5 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -323,10 +323,10 @@ void wxFontRefData::Init(
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 

-    m_bNativeFontInfoOk = FALSE;
+    m_bNativeFontInfoOk = false;

 
     m_nFontId     = 0;
 
     m_nFontId     = 0;

-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;

     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;
     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;


@@ -359,7 +359,7 @@ void wxFontRefData::Init(
         m_hPS = (HPS)hPS;
 
     m_nFontId     = 0;
         m_hPS = (HPS)hPS;
 
     m_nFontId     = 0;

-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;

     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init
     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init


@@ -782,56 +782,56 @@ bool wxNativeFontInfo::FromString( const wxString& rsStr )
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))

-        return FALSE;
+        return false;

 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))

-        return FALSE;
+        return false;

     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)
     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)

-        return FALSE;
+        return false;

     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
     return true;
 } // end of wxNativeFontInfo::FromString
     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
     return true;
 } // end of wxNativeFontInfo::FromString


@@ -1103,7 +1103,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

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

 
     return M_FONTDATA->GetUnderlined();
 } // end of wxFont::GetUnderlined
 
     return M_FONTDATA->GetUnderlined();
 } // end of wxFont::GetUnderlined

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index dd82cee220ce17bd170e7b30ce8e8f49afcf226d..8bee414a332583c165af3a998a910ce6cd04ee8e 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -11,6 +11,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"


@@ -18,8 +20,6 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#if wxUSE_PRINTING_ARCHITECTURE
-

 #include "wx/os2/printos2.h"
 #include "wx/generic/prntdlgg.h"
 
 #include "wx/os2/printos2.h"
 #include "wx/generic/prntdlgg.h"
 

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 8c322fbb384f7c17df68f2b0fe5ead8ac9a3f406..fe83f29f54136507f0a0f833f292ac3104d54929 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -13,8 +13,8 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/window.h"

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

+    #include "wx/window.h"

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


@@ -96,18 +96,13 @@ void wxTimer::Notify()
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 

-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
+bool wxTimer::Start( int nMilliseconds, bool bOneShot )

 {
 {

-    (void)wxTimerBase::Start( nMilliseconds
-                             ,bOneShot
-                            );
+    (void)wxTimerBase::Start( nMilliseconds, bOneShot );

 
 

-    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
+    wxCHECK_MSG( m_milli > 0L, false, wxT("invalid value for timer") );

 
 

-    wxWindow*                       pWin = NULL;
+    wxWindow* pWin = NULL;

 
     if (m_owner)
     {
 
     if (m_owner)
     {


@@ -148,7 +143,7 @@ bool wxTimer::Start(
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return(FALSE);
+        return false;

     }
 }
 
     }
 }
 

diff --git a/src/palmos/gdiobj.cpp b/src/palmos/gdiobj.cpp
index 671c08115437338a3bb7b650d57aee05f57de351..df63fdcb9353226d270e60a075acaa6ae69baa36 100644 (file)
--- a/src/palmos/gdiobj.cpp
+++ b/src/palmos/gdiobj.cpp
@@ -13,27 +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 <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 #endif
 
 #include "wx/gdiobj.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

-
-/*
-void wxGDIObject::IncrementResourceUsage(void)
-{
-};
-
-void wxGDIObject::DecrementResourceUsage(void)
-{
-};
-
-*/

diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp
index 4867dbe6bede835edca7da288d993ef3a946d15f..426dc3036748f2f7bc76e572930531a0beaa001d 100644 (file)
--- a/src/palmos/timer.cpp
+++ b/src/palmos/timer.cpp
@@ -19,8 +19,8 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP

-    #include "wx/window.h"

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

+    #include "wx/window.h"

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


@@ -98,4 +98,3 @@ void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER

-