From 8ecff18117f8cabc0f515ad81aa4ad265e5e17d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 20 Apr 2006 07:31:44 +0000 Subject: [PATCH] Include wx/list.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appbase.cpp | 9 ++++----- src/common/appcmn.cpp | 2 +- src/common/artprov.cpp | 9 +++++---- src/common/db.cpp | 2 +- src/common/dbtable.cpp | 2 +- src/common/docview.cpp | 22 +++++++++++----------- src/common/event.cpp | 2 +- src/common/hash.cpp | 4 ++-- src/common/imagpcx.cpp | 2 +- src/common/url.cpp | 13 ++++++++----- src/common/xti.cpp | 2 +- src/generic/accel.cpp | 5 ++--- src/generic/helpext.cpp | 2 +- src/gtk/utilsres.cpp | 30 ++++++++++++++++-------------- src/gtk1/utilsres.cpp | 30 ++++++++++++++++-------------- src/html/htmlwin.cpp | 3 +-- src/mgl/gdiobj.cpp | 8 ++++---- src/motif/cursor.cpp | 8 ++++++-- src/msw/bitmap.cpp | 2 +- src/msw/gdiobj.cpp | 10 +++++----- src/msw/icon.cpp | 1 - src/msw/pen.cpp | 12 ++++++------ src/msw/timer.cpp | 5 ++--- src/msw/urlmsw.cpp | 5 ++++- src/os2/bitmap.cpp | 7 ++----- src/os2/brush.cpp | 20 ++++++++------------ src/os2/cursor.cpp | 12 ++++++------ src/os2/font.cpp | 30 +++++++++++++++--------------- src/os2/print.cpp | 4 ++-- src/os2/timer.cpp | 17 ++++++----------- src/palmos/gdiobj.cpp | 21 +++++---------------- src/palmos/timer.cpp | 3 +-- 32 files changed, 145 insertions(+), 159 deletions(-) diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 5a6a35127e..efc2c45cbd 100644 --- 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: @@ -25,9 +25,9 @@ #endif #ifndef WX_PRECOMP + #include "wx/list.h" #include "wx/app.h" #include "wx/intl.h" - #include "wx/list.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -269,7 +269,7 @@ void wxAppConsole::ProcessPendingEvents() if ( !wxPendingEventsLocker ) return; #endif - + // 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 ); - + handler->ProcessPendingEvents(); wxENTER_CRIT_SECT( *wxPendingEventsLocker ); @@ -839,4 +839,3 @@ void ShowAssertDialog(const wxChar *szFile, } #endif // __WXDEBUG__ - diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index d78a126972..fe6e903810 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -25,10 +25,10 @@ #endif #ifndef WX_PRECOMP + #include "wx/list.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" diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 2e8a1df31c..5d3ab8655e 100644 --- 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: @@ -21,15 +21,16 @@ #endif #ifndef WX_PRECOMP - #include "wx/log.h" #include "wx/list.h" + #include "wx/log.h" #endif #include "wx/artprov.h" #include "wx/hashmap.h" #include "wx/module.h" + #if wxUSE_IMAGE -#include "wx/image.h" + #include "wx/image.h" #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 - return wxDefaultSize; + return wxDefaultSize; #endif // GTK+ 2/else } diff --git a/src/common/db.cpp b/src/common/db.cpp index b9b113d621..923ee6a374 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -31,8 +31,8 @@ #ifndef WX_PRECOMP #include "wx/object.h" - #include "wx/string.h" #include "wx/list.h" + #include "wx/string.h" #include "wx/utils.h" #include "wx/log.h" #endif diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index 80313ac708..346dcd34f9 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -21,8 +21,8 @@ #ifndef WX_PRECOMP #include "wx/object.h" - #include "wx/string.h" #include "wx/list.h" + #include "wx/string.h" #include "wx/utils.h" #include "wx/log.h" #endif diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 22fc22e499..3e1167c0f0 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -21,19 +21,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #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/list.h" #include "wx/filedlg.h" #include "wx/intl.h" #include "wx/log.h" @@ -50,8 +50,8 @@ #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" @@ -66,14 +66,14 @@ #include #if wxUSE_STD_IOSTREAM - #include "wx/ioswrap.h" - #if wxUSE_IOSTREAMH - #include - #else - #include - #endif + #include "wx/ioswrap.h" + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif #else - #include "wx/wfstream.h" + #include "wx/wfstream.h" #endif // ---------------------------------------------------------------------------- diff --git a/src/common/event.cpp b/src/common/event.cpp index a4f85d7d61..e29dd4e6fb 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -25,8 +25,8 @@ #endif #ifndef WX_PRECOMP - #include "wx/app.h" #include "wx/list.h" + #include "wx/app.h" #if wxUSE_GUI #include "wx/control.h" diff --git a/src/common/hash.cpp b/src/common/hash.cpp index bc1a7583aa..7c9ea3da69 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -21,11 +21,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/list.h" + #include "wx/list.h" #endif #include "wx/hash.h" diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index 21b13599b9..0581f926fc 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -19,6 +19,7 @@ #ifndef WX_PRECOMP #include "wx/object.h" + #include "wx/list.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/list.h" //----------------------------------------------------------------------------- // wxPCXHandler diff --git a/src/common/url.cpp b/src/common/url.cpp index 3bf910e425..65f2fe7265 100644 --- 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: @@ -13,13 +13,16 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_URL +#ifndef WX_PRECOMP + #include "wx/list.h" +#endif + #include "wx/string.h" -#include "wx/list.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), - port = tmp_str(pos+1, tmp_str.Length()-pos); + port = tmp_str(pos+1, tmp_str.length()-pos); wxIPV4address addr; if (!addr.Hostname(hostname)) @@ -371,7 +374,7 @@ void wxURL::SetProxy(const wxString& url_proxy) 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); diff --git a/src/common/xti.cpp b/src/common/xti.cpp index 79f840c258..04e166170d 100644 --- a/src/common/xti.cpp +++ b/src/common/xti.cpp @@ -21,13 +21,13 @@ #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/list.h" #include #include "wx/beforestd.h" diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp index e19d33c09f..f31532caa6 100644 --- 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 @@ -26,8 +26,8 @@ #if wxUSE_ACCEL #ifndef WX_PRECOMP - #include "wx/event.h" #include "wx/list.h" + #include "wx/event.h" #endif // WX_PRECOMP #include "wx/accel.h" @@ -218,4 +218,3 @@ wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) c } #endif // wxUSE_ACCEL - diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 455c0224c0..7a8135133d 100644 --- 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 + #include "wx/list.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" diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp index 45bdc9fec1..3efcd634f9 100644 --- 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$ @@ -10,9 +10,12 @@ // 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/list.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 ); - if (filename.IsEmpty()) filename = wxT(".wxWindows"); + if (filename.empty()) filename = wxT(".wxWindows"); 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 ); - if (filename.IsEmpty()) filename = wxT(".wxWindows"); + if (filename.empty()) filename = wxT(".wxWindows"); 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 )) { - if (!result.IsEmpty()) + if (!result.empty()) { 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 ) @@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value, { *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 ) @@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value, { *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 ) @@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c { *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 45bdc9fec1..76deb2b6be 100644 --- 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$ @@ -10,9 +10,12 @@ // 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/list.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 ); - if (filename.IsEmpty()) filename = wxT(".wxWindows"); + if (filename.empty()) filename = wxT(".wxWindows"); 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 ); - if (filename.IsEmpty()) filename = wxT(".wxWindows"); + if (filename.empty()) filename = wxT(".wxWindows"); 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 )) { - if (!result.IsEmpty()) + if (!result.empty()) { 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 ) @@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value, { *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 ) @@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value, { *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 ) @@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c { *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 9b5fc735fa..698e4cccb4 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -16,6 +16,7 @@ #if wxUSE_HTML && wxUSE_STREAMS #ifndef WXPRECOMP + #include "wx/list.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/list.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 - diff --git a/src/mgl/gdiobj.cpp b/src/mgl/gdiobj.cpp index fd2bd43779..e23c754e93 100644 --- a/src/mgl/gdiobj.cpp +++ b/src/mgl/gdiobj.cpp @@ -13,13 +13,13 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" + #include + #include "wx/list.h" + #include "wx/utils.h" #endif #include "wx/gdiobj.h" diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 5548cac505..37b680dd54 100644 --- 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" +#ifndef WX_PRECOMP + #include "wx/list.h" +#endif + #include "wx/cursor.h" #include "wx/app.h" #include "wx/utils.h" -#include "wx/list.h" #include "wx/window.h" + #if wxUSE_IMAGE -#include "wx/image.h" + #include "wx/image.h" #endif #ifdef __VMS__ diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index d1e489c883..ebcaac1652 100644 --- 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: diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp index ab671b673b..447c88327b 100644 --- a/src/msw/gdiobj.cpp +++ b/src/msw/gdiobj.cpp @@ -13,14 +13,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" #endif #include "wx/gdiobj.h" diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index 2b02805615..67f83d31f6 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/defs.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 1ddd61e07f..d460b6a9b4 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -13,15 +13,15 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/pen.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/pen.h" #endif #include "wx/msw/private.h" diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index d93588c637..fef9ff0dfc 100644 --- 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) @@ -19,8 +19,8 @@ #if wxUSE_TIMER #ifndef WX_PRECOMP - #include "wx/window.h" #include "wx/list.h" + #include "wx/window.h" #include "wx/event.h" #include "wx/app.h" #include "wx/intl.h" @@ -162,4 +162,3 @@ wxTimerProc(HWND WXUNUSED(hwnd), } #endif // wxUSE_TIMER - diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp index 79b0ae8919..891cdb6bc0 100644 --- a/src/msw/urlmsw.cpp +++ b/src/msw/urlmsw.cpp @@ -18,6 +18,10 @@ #if wxUSE_URL_NATIVE +#ifndef WX_PRECOMP + #include "wx/list.h" +#endif + #if !wxUSE_PROTOCOL_HTTP #include "wx/protocol/protocol.h" @@ -60,7 +64,6 @@ USE_PROTOCOL(wxHTTPDummyProto) #endif #include "wx/string.h" -#include "wx/list.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 59451cffd2..f60d0f7c9b 100644 --- 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: @@ -27,7 +27,6 @@ #include "wx/os2/private.h" #include "wx/log.h" -//#include "wx/msw/dib.h" #include "wx/image.h" #include "wx/xpmdecod.h" @@ -90,9 +89,7 @@ void 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; diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index acd9b7f57b..d4a0a320dd 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -13,12 +13,12 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/brush.h" -#include "wx/log.h" + #include + #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" @@ -34,9 +34,7 @@ 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; @@ -75,9 +73,7 @@ wxBrush::wxBrush( RealizeResource(); } // end of wxBrush::wxBrush -wxBrush::wxBrush( - const wxBitmap& rStipple -) +wxBrush::wxBrush(const wxBitmap& rStipple) { m_refData = new wxBrushRefData; diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index 2bb61ca264..ebbb30b741 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -13,12 +13,12 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/cursor.h" -#include "wx/icon.h" + #include + #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" diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 6c7507082e..63be231df6 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -323,10 +323,10 @@ void wxFontRefData::Init( m_vEncoding = vEncoding; m_hFont = 0; - m_bNativeFontInfoOk = FALSE; + m_bNativeFontInfoOk = false; m_nFontId = 0; - m_bTemporary = FALSE; + m_bTemporary = false; 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_bTemporary = FALSE; + m_bTemporary = false; 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')) - return FALSE; + return false; sToken = vTokenizer.GetNextToken(); if (!sToken.ToLong(&lVal)) - return FALSE; + return false; fm.lEmHeight = lVal; sToken = vTokenizer.GetNextToken(); if (!sToken.ToLong(&lVal)) - return FALSE; + return false; 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)) - return FALSE; + return false; 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)) - return FALSE; + return false; 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)) - return FALSE; + return false; fa.lMatch = lVal; sToken = vTokenizer.GetNextToken(); if (!sToken.ToLong(&lVal)) - return FALSE; + return false; 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 @@ -1103,7 +1103,7 @@ int wxFont::GetWeight() 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 diff --git a/src/os2/print.cpp b/src/os2/print.cpp index dd82cee220..8bee414a33 100644 --- a/src/os2/print.cpp +++ b/src/os2/print.cpp @@ -11,6 +11,8 @@ #include "wx/wxprec.h" +#if wxUSE_PRINTING_ARCHITECTURE + #ifndef WX_PRECOMP #include #include "wx/list.h" @@ -18,8 +20,6 @@ #include "wx/app.h" #endif -#if wxUSE_PRINTING_ARCHITECTURE - #include "wx/os2/printos2.h" #include "wx/generic/prntdlgg.h" diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp index 8c322fbb38..fe83f29f54 100644 --- a/src/os2/timer.cpp +++ b/src/os2/timer.cpp @@ -13,8 +13,8 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP - #include "wx/window.h" #include "wx/list.h" + #include "wx/window.h" #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 -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) { @@ -148,7 +143,7 @@ bool wxTimer::Start( { wxLogSysError(_("Couldn't create a timer")); - return(FALSE); + return false; } } diff --git a/src/palmos/gdiobj.cpp b/src/palmos/gdiobj.cpp index 671c081154..df63fdcb93 100644 --- a/src/palmos/gdiobj.cpp +++ b/src/palmos/gdiobj.cpp @@ -13,27 +13,16 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" #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 4867dbe6be..426dc30367 100644 --- a/src/palmos/timer.cpp +++ b/src/palmos/timer.cpp @@ -19,8 +19,8 @@ #if wxUSE_TIMER #ifndef WX_PRECOMP - #include "wx/window.h" #include "wx/list.h" + #include "wx/window.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 - -- 2.45.2