From 88a7a4e10ed18f81a576dcd866cfbf02bf404c00 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 25 Apr 2006 14:38:19 +0000 Subject: [PATCH] Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/config.cpp | 14 ++- src/common/datetime.cpp | 56 +++++----- src/common/dynarray.cpp | 3 +- src/common/imagjpeg.cpp | 7 +- src/common/imagpnm.cpp | 11 +- src/common/imagtiff.cpp | 5 +- src/common/mimecmn.cpp | 6 +- src/common/module.cpp | 5 +- src/common/sizer.cpp | 2 +- src/common/socket.cpp | 2 +- src/common/stockitem.cpp | 8 +- src/common/zstream.cpp | 11 +- src/generic/dbgrptg.cpp | 12 +- src/generic/dcpsg.cpp | 26 ++--- src/generic/dirctrlg.cpp | 5 +- src/generic/dragimgg.cpp | 18 +-- src/generic/filedlgg.cpp | 9 +- src/gtk/app.cpp | 28 +++-- src/gtk/combobox.cpp | 5 +- src/gtk/dnd.cpp | 12 +- src/gtk/filedlg.cpp | 5 +- src/gtk/fontdlg.cpp | 14 +-- src/gtk/listbox.cpp | 5 +- src/gtk/mdi.cpp | 9 +- src/gtk/menu.cpp | 9 +- src/gtk/msgdlg.cpp | 12 +- src/gtk/notebook.cpp | 15 ++- src/gtk/textctrl.cpp | 6 +- src/gtk/utilsgtk.cpp | 2 +- src/gtk/window.cpp | 12 +- src/gtk1/app.cpp | 8 +- src/gtk1/combobox.cpp | 5 +- src/gtk1/dnd.cpp | 12 +- src/gtk1/fontdlg.cpp | 14 +-- src/gtk1/listbox.cpp | 7 +- src/gtk1/mdi.cpp | 9 +- src/gtk1/menu.cpp | 8 +- src/gtk1/notebook.cpp | 15 ++- src/gtk1/textctrl.cpp | 6 +- src/gtk1/utilsgtk.cpp | 2 +- src/gtk1/window.cpp | 6 +- src/mac/carbon/app.cpp | 48 ++++---- src/mac/carbon/cfsocket.cpp | 2 +- src/mac/carbon/clipbrd.cpp | 8 +- src/mac/carbon/dataobj.cpp | 5 +- src/mac/carbon/filedlg.cpp | 19 ++-- src/mac/carbon/fontdlgosx.mm | 130 +++++++++++---------- src/mac/carbon/fontenum.cpp | 9 +- src/mac/carbon/mimetmac.cpp | 6 +- src/mac/carbon/msgdlg.cpp | 9 +- src/mac/carbon/sound.cpp | 2 +- src/mac/carbon/textctrl.cpp | 21 ++-- src/mac/carbon/utils.cpp | 211 ++++++++++++++++++----------------- src/mac/classic/app.cpp | 8 +- src/mac/classic/clipbrd.cpp | 24 ++-- src/mac/classic/filedlg.cpp | 8 +- src/mac/classic/mimetmac.cpp | 6 +- src/mac/classic/msgdlg.cpp | 12 +- src/mac/classic/utils.cpp | 15 ++- src/mgl/bitmap.cpp | 6 +- src/mgl/cursor.cpp | 6 +- src/mgl/utils.cpp | 2 +- src/mgl/window.cpp | 5 +- src/motif/app.cpp | 5 +- src/motif/dnd.cpp | 6 +- src/motif/filedlg.cpp | 8 +- src/motif/msgdlg.cpp | 8 +- src/msdos/mimetype.cpp | 6 +- src/msdos/utilsdos.cpp | 2 +- src/msw/dib.cpp | 7 +- src/msw/dragimag.cpp | 20 ++-- src/msw/imaglist.cpp | 2 +- src/msw/mimetype.cpp | 6 +- src/msw/registry.cpp | 2 +- src/msw/statbr95.cpp | 15 +-- src/msw/window.cpp | 2 +- src/os2/mimetype.cpp | 6 +- src/os2/thread.cpp | 11 +- src/os2/timer.cpp | 2 +- src/os2/utils.cpp | 2 +- src/os2/window.cpp | 2 +- src/palmos/datectrl.cpp | 10 +- src/palmos/dib.cpp | 7 +- src/palmos/dragimag.cpp | 14 +-- src/palmos/imaglist.cpp | 3 +- src/palmos/statbrpalm.cpp | 9 +- src/palmos/window.cpp | 2 +- src/richtext/richtextxml.cpp | 30 ++--- src/unix/dialup.cpp | 5 +- src/unix/displayx11.cpp | 5 +- src/unix/mimetype.cpp | 6 +- src/unix/threadpsx.cpp | 5 +- src/unix/utilsunx.cpp | 5 +- src/x11/app.cpp | 5 +- src/x11/dnd.cpp | 8 +- src/x11/textctrl.cpp | 8 +- src/xml/xml.cpp | 5 +- src/xrc/xh_chckl.cpp | 18 +-- src/xrc/xh_choic.cpp | 8 +- src/xrc/xh_combo.cpp | 8 +- src/xrc/xh_dlg.cpp | 6 +- src/xrc/xh_frame.cpp | 6 +- src/xrc/xh_listb.cpp | 8 +- src/xrc/xh_mdi.cpp | 8 +- src/xrc/xh_radbx.cpp | 8 +- src/xrc/xmlres.cpp | 18 +-- 106 files changed, 757 insertions(+), 558 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index 62013b23e4..62c14b2414 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: config.cpp +// Name: src/common/config.cpp // Purpose: implementation of wxConfigBase class // Author: Vadim Zeitlin // Modified by: @@ -16,8 +16,8 @@ #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif //__BORLANDC__ #ifndef wxUSE_CONFIG_NATIVE @@ -25,7 +25,11 @@ #endif #include "wx/config.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif //WX_PRECOMP + #include "wx/log.h" #include "wx/arrstr.h" @@ -447,5 +451,3 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) pc++; } } - - diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 1873b01846..b27c1010bb 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -68,9 +68,9 @@ #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/intl.h" #endif // WX_PRECOMP -#include "wx/intl.h" #include "wx/thread.h" #include "wx/tokenzr.h" #include "wx/module.h" @@ -2403,40 +2403,42 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const { nLostWeekDays += year++ % 4 ? 1 : 2; } - - // Keep year below 2000 so the 2digit year number - // can never match the month or day of the month - if (year>=2000) year-=28; + + // Keep year below 2000 so the 2digit year number + // can never match the month or day of the month + if (year>=2000) year-=28; // at any rate, we couldn't go further than 1988 + 9 + 28! wxASSERT_MSG( year < 2030, _T("logic error in wxDateTime::Format") ); - wxString strYear, strYear2; + wxString strYear, strYear2; strYear.Printf(_T("%d"), year); strYear2.Printf(_T("%d"), year % 100); - + // find four strings not occurring in format (this is surely // not the optimal way of doing it... improvements welcome!) wxString fmt2 = format; - wxString replacement,replacement2,replacement3,replacement4; - for (int rnr=1; rnr<5 ; rnr++) { - wxString r = (wxChar)-rnr; - while ( fmt2.Find(r) != wxNOT_FOUND ) - { - r << (wxChar)-rnr; - } - - switch (rnr) { - case 1: replacement=r; break; - case 2: replacement2=r; break; - case 3: replacement3=r; break; - case 4: replacement4=r; break; - } - } + wxString replacement,replacement2,replacement3,replacement4; + for (int rnr=1; rnr<5 ; rnr++) + { + wxString r = (wxChar)-rnr; + while ( fmt2.Find(r) != wxNOT_FOUND ) + { + r << (wxChar)-rnr; + } + + switch (rnr) + { + case 1: replacement=r; break; + case 2: replacement2=r; break; + case 3: replacement3=r; break; + case 4: replacement4=r; break; + } + } // replace all occurrences of year with it bool wasReplaced = fmt2.Replace(strYear, replacement) > 0; // evaluation order ensures we always attempt the replacement. - wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) | wasReplaced ; + wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) | wasReplaced ; // use strftime() to format the same date but in supported // year @@ -2461,10 +2463,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const &tmAdjusted); // now replace the occurrence of 1999 with the real year - // we do this in two stages to stop the 2 digit year - // matching any substring of the 4 digit year. - // Any day,month hours and minutes components should be safe due - // to ensuring the range of the years. + // we do this in two stages to stop the 2 digit year + // matching any substring of the 4 digit year. + // Any day,month hours and minutes components should be safe due + // to ensuring the range of the years. wxString strYearReal, strYearReal2; strYearReal.Printf(_T("%04d"), yearReal); strYearReal2.Printf(_T("%02d"), yearReal % 100); diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index ead8099c32..c856a651f6 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -22,10 +22,9 @@ #ifndef WX_PRECOMP #include "wx/dynarray.h" + #include "wx/intl.h" #endif //WX_PRECOMP -#include "wx/intl.h" - #include #include // for memmove diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 9892a3fcc2..790dc68121 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -11,17 +11,19 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_IMAGE && wxUSE_LIBJPEG +#include "wx/imagjpeg.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/intl.h" #endif -#include "wx/imagjpeg.h" #include "wx/bitmap.h" #include "wx/debug.h" @@ -45,7 +47,6 @@ extern "C" #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" #include "wx/module.h" // For memcpy diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp index 86884d7d09..15b611ee64 100644 --- a/src/common/imagpnm.cpp +++ b/src/common/imagpnm.cpp @@ -11,17 +11,18 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP + #pragma hdrstop #endif #if wxUSE_IMAGE && wxUSE_PNM #include "wx/imagpnm.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/log.h" -#include "wx/intl.h" #include "wx/txtstrm.h" //----------------------------------------------------------------------------- diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index ed0ec204b7..7662ccf86c 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -16,12 +16,14 @@ #if wxUSE_IMAGE && wxUSE_LIBTIFF +#include "wx/imagtiff.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/intl.h" #endif -#include "wx/imagtiff.h" #include "wx/bitmap.h" #include "wx/debug.h" extern "C" @@ -31,7 +33,6 @@ extern "C" } #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" #include "wx/module.h" #ifndef TIFFLINKAGEMODE diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 326eefa0af..44f0fbe108 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -27,20 +27,20 @@ #if wxUSE_MIMETYPE +#include "wx/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #endif //WX_PRECOMP #include "wx/module.h" #include "wx/log.h" #include "wx/file.h" #include "wx/iconloc.h" -#include "wx/intl.h" #include "wx/confbase.h" -#include "wx/mimetype.h" - // other standard headers #include diff --git a/src/common/module.cpp b/src/common/module.cpp index e4eb228f23..aebe228545 100644 --- a/src/common/module.cpp +++ b/src/common/module.cpp @@ -16,12 +16,13 @@ #pragma hdrstop #endif +#include "wx/module.h" + #ifndef WX_PRECOMP #include "wx/hash.h" + #include "wx/intl.h" #endif -#include "wx/module.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/listimpl.cpp" diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 1d9e4c216b..d52151ef33 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -28,7 +28,7 @@ #include "wx/statbox.h" #include "wx/settings.h" #include "wx/listimpl.cpp" -#include "wx/intl.h" + #if WXWIN_COMPATIBILITY_2_4 #include "wx/notebook.h" #endif diff --git a/src/common/socket.cpp b/src/common/socket.cpp index da94159c17..65eb47d404 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -27,6 +27,7 @@ #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/app.h" @@ -35,7 +36,6 @@ #include "wx/utils.h" #include "wx/module.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/event.h" #include "wx/sckaddr.h" diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index c1b7d71ad8..a43f3a435a 100644 --- a/src/common/stockitem.cpp +++ b/src/common/stockitem.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/stockitem.cpp +// Name: src/common/stockitem.cpp // Purpose: Stock buttons, menu and toolbar items labels // Author: Vaclav Slavik // Modified by: @@ -25,7 +25,11 @@ #endif #include "wx/stockitem.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" // for wxStripMenuCodes() bool wxIsStockID(wxWindowID id) diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 0b4878cf91..f3b4ffc4dd 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// Name: zstream.cpp +// Name: src/common/zstream.cpp // Purpose: Compressed stream classes // Author: Guilhem Lavaux // Modified by: Mike Wetherell @@ -13,14 +13,18 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_ZLIB && wxUSE_STREAMS #include "wx/zstream.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" // normally, the compiler options should contain -I../zlib, but it is @@ -331,4 +335,3 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) #endif // wxUSE_ZLIB && wxUSE_STREAMS - diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp index f4f89178bd..6cd8575107 100644 --- a/src/generic/dbgrptg.cpp +++ b/src/generic/dbgrptg.cpp @@ -23,17 +23,17 @@ #pragma hdrstop #endif +#if wxUSE_DEBUGREPORT && wxUSE_XML + +#include "wx/debugrpt.h" + #ifndef WX_PRECOMP #include "wx/sizer.h" #include "wx/checklst.h" #include "wx/textctrl.h" + #include "wx/intl.h" #endif // WX_PRECOMP -#if wxUSE_DEBUGREPORT && wxUSE_XML - -#include "wx/debugrpt.h" - -#include "wx/intl.h" #include "wx/filename.h" #include "wx/ffile.h" #include "wx/mimetype.h" @@ -512,4 +512,4 @@ bool wxDebugReportPreviewStd::Show(wxDebugReport& dbgrpt) const return dlg.ShowModal() == wxID_OK && dbgrpt.GetFilesCount() != 0; } -#endif // wxUSE_DEBUGREPORT +#endif // wxUSE_DEBUGREPORT && wxUSE_XML diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index ff50f09120..86d9c8ac68 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -15,20 +15,19 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif // WX_PRECOMP +#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT -#if wxUSE_PRINTING_ARCHITECTURE +#include "wx/generic/dcpsg.h" -#if wxUSE_POSTSCRIPT +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif // WX_PRECOMP #include "wx/dcmemory.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/app.h" #include "wx/image.h" #include "wx/log.h" -#include "wx/generic/dcpsg.h" #include "wx/prntbase.h" #include "wx/generic/prntdlgg.h" #include "wx/paper.h" @@ -1048,8 +1047,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) PsPrint( buffer ); } PsPrint ("] 0 setdash\n"); - psdash = 0; - } + psdash = 0; + } break; case wxSOLID: case wxTRANSPARENT: @@ -1258,7 +1257,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) @@ -1383,7 +1382,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } void wxPostScriptDC::SetBackground (const wxBrush& brush) @@ -2258,11 +2257,6 @@ void wxPostScriptDC::PsPrint( int ch ) } } -#endif - // wxUSE_POSTSCRIPT - -#endif - // wxUSE_PRINTING_ARCHITECTURE - +#endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT // vi:sts=4:sw=4:et diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 159b5eadfc..eeef7d9129 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -18,11 +18,13 @@ #if wxUSE_DIRDLG || wxUSE_FILEDLG +#include "wx/generic/dirctrlg.h" + #ifndef WX_PRECOMP #include "wx/hash.h" + #include "wx/intl.h" #endif -#include "wx/generic/dirctrlg.h" #include "wx/module.h" #include "wx/utils.h" #include "wx/button.h" @@ -33,7 +35,6 @@ #include "wx/filefn.h" #include "wx/cmndata.h" #include "wx/gdicmn.h" -#include "wx/intl.h" #include "wx/imaglist.h" #include "wx/icon.h" #include "wx/log.h" diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 31c91dc092..f171e14767 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -21,23 +21,23 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DRAGIMAGE #ifndef WX_PRECOMP -#include -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/dcclient.h" -#include "wx/dcscreen.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" + #include + #include "wx/window.h" + #include "wx/frame.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/intl.h" #endif #include "wx/log.h" -#include "wx/intl.h" #define wxUSE_IMAGE_IN_DRAGIMAGE 1 diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index c372fb9fac..9d1f8f7e2a 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -23,6 +23,13 @@ #error wxGenericFileDialog currently only supports Unix, win32 and DOS #endif +#include "wx/generic/filedlgg.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" +#endif + #include "wx/checkbox.h" #include "wx/textctrl.h" #include "wx/choice.h" @@ -31,7 +38,6 @@ #include "wx/debug.h" #include "wx/log.h" #include "wx/longlong.h" -#include "wx/intl.h" #include "wx/msgdlg.h" #include "wx/sizer.h" #include "wx/bmpbuttn.h" @@ -44,7 +50,6 @@ #include "wx/filefn.h" #include "wx/file.h" // for wxS_IXXX constants only #include "wx/filedlg.h" // wxOPEN, wxSAVE... -#include "wx/generic/filedlgg.h" #include "wx/generic/dirctrlg.h" // for wxFileIconsTable #if wxUSE_TOOLTIPS diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 8f8e0869dc..aeeb7ee8c0 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -17,9 +17,13 @@ #include "wx/wxprec.h" #include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/gdicmn.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/memory.h" #include "wx/font.h" @@ -33,7 +37,7 @@ #include "wx/thread.h" #ifdef __WXGPE__ -#include + #include #endif #ifdef __WXUNIVERSAL__ @@ -113,7 +117,7 @@ static wxMutex gs_idleTagsMutex; // not static because used by textctrl.cpp // // MT-FIXME -bool wxIsInsideYield = FALSE; +bool wxIsInsideYield = false; bool wxApp::Yield(bool onlyIfNeeded) { @@ -124,18 +128,18 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } #if wxUSE_THREADS if ( !wxThread::IsMain() ) { // can't call gtk_main_iteration() from other threads like this - return TRUE; + return true; } #endif // wxUSE_THREADS - wxIsInsideYield = TRUE; + wxIsInsideYield = true; // We need to remove idle callbacks or the loop will // never finish. @@ -163,9 +167,9 @@ bool wxApp::Yield(bool onlyIfNeeded) wxLog::Resume(); #endif - wxIsInsideYield = FALSE; + wxIsInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- @@ -483,7 +487,7 @@ bool wxApp::OnInitGui() } // Nothing to do for 15, 16, 24, 32 bit displays - if (visual->depth > 8) return TRUE; + if (visual->depth > 8) return true; // initialize color cube for 8-bit color reduction dithering @@ -533,7 +537,7 @@ bool wxApp::OnInitGui() } } - return TRUE; + return true; } GdkVisual *wxApp::GetGdkVisual() @@ -680,7 +684,7 @@ void wxApp::CleanUp() void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; wxAppBase::OnAssert(file, line, cond, msg); diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 9f631e21d8..b73a7ad394 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -14,9 +14,12 @@ #include "wx/combobox.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/settings.h" #include "wx/arrstr.h" -#include "wx/intl.h" #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index f47e0b983d..14cee77258 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ @@ -10,16 +10,18 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dnd.h" -#include "wx/log.h" +#if wxUSE_DRAG_AND_DROP +#include "wx/dnd.h" -#if wxUSE_DRAG_AND_DROP +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif #include "wx/window.h" #include "wx/app.h" #include "wx/gdicmn.h" -#include "wx/intl.h" +#include "wx/log.h" #include "wx/utils.h" #include "wx/gtk/private.h" diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 57a34be327..77f19242de 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -14,6 +14,10 @@ #include "wx/filedlg.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #ifdef __WXGTK24__ #include @@ -21,7 +25,6 @@ #include // chdir -#include "wx/intl.h" #include "wx/filename.h" // wxFilename #include "wx/tokenzr.h" // wxStringTokenizer #include "wx/filefn.h" // ::wxGetCwd diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index d51b0fb949..50e7ad2331 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -10,14 +10,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FONTDLG - -#ifndef __WXGPE__ +#if wxUSE_FONTDLG && !defined(__WXGPE__) #include "wx/fontdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/fontutil.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/debug.h" #include "wx/msgdlg.h" @@ -154,6 +156,4 @@ void wxFontDialog::SetChosenFont(const char *fontname) m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } -#endif // wxUSE_FONTDLG - -#endif // GPE +#endif // wxUSE_FONTDLG && !__WXGPE__ diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index cc241866a7..6df91cf93f 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -13,14 +13,15 @@ #if wxUSE_LISTBOX +#include "wx/listbox.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" + #include "wx/intl.h" #endif -#include "wx/listbox.h" #include "wx/arrstr.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/checklst.h" #include "wx/settings.h" #include "wx/log.h" diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index a15c6a7500..c06efa1a51 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -10,14 +10,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_MDI + #include "wx/mdi.h" -#include "wx/notebook.h" -#if wxUSE_MDI +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif +#include "wx/notebook.h" #include "wx/dialog.h" #include "wx/menu.h" -#include "wx/intl.h" #include "wx/gtk/private.h" #include diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index f02968fc17..aa3a7bee52 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/gtk/menu.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,8 +11,12 @@ #include "wx/wxprec.h" #include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/log.h" -#include "wx/intl.h" #include "wx/app.h" #include "wx/bitmap.h" @@ -1514,4 +1518,3 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) } #endif // wxUSE_MENUS_NATIVE - diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp index 6c12db782e..fa66968937 100644 --- a/src/gtk/msgdlg.cpp +++ b/src/gtk/msgdlg.cpp @@ -13,17 +13,20 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__) #include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/gtk/private.h" #include -#include "wx/intl.h" - IMPLEMENT_CLASS(wxMessageDialog, wxDialog) wxMessageDialog::wxMessageDialog(wxWindow *parent, @@ -126,5 +129,4 @@ int wxMessageDialog::ShowModal() } -#endif // wxUSE_MSGDLG && defined(__WXGTK20__) - +#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__) diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 25785835a2..1e29e55f49 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk/notebook.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,14 +10,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" -#if wxUSE_NOTEBOOK +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif #include "wx/panel.h" #include "wx/utils.h" #include "wx/imaglist.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/bitmap.h" #include "wx/fontutil.h" @@ -383,13 +386,13 @@ int wxNotebook::GetSelection() const wxString wxNotebook::GetPageText( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return wxT(""); + return wxEmptyString; } int wxNotebook::GetPageImage( size_t page ) const @@ -691,7 +694,7 @@ bool wxNotebook::InsertPage( size_t position, /* set the label text */ nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); + if (nb_page->m_text.empty()) nb_page->m_text = wxT(""); nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 5a7a67d2ab..7705302842 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -11,8 +11,12 @@ #include "wx/wxprec.h" #include "wx/textctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/math.h" #include "wx/settings.h" diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index ae61014f02..1a65822ba3 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -14,10 +14,10 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/apptrait.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/process.h" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index bf1f62fa13..40b265aa84 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -15,6 +15,11 @@ #endif #include "wx/window.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/dcclient.h" #include "wx/frame.h" #include "wx/app.h" @@ -46,7 +51,6 @@ #include "wx/menu.h" #include "wx/statusbr.h" -#include "wx/intl.h" #include "wx/settings.h" #include "wx/log.h" #include "wx/fontutil.h" @@ -4281,12 +4285,12 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) { //RN: Note that static controls usually have no border on gtk, so maybe - //it makes sense to treat that as simply no border at the wx level + //it makes sense to treat that as simply no border at the wx level //as well... if (!(wxstyle & wxNO_BORDER) && !(wxstyle & wxBORDER_STATIC)) { GtkShadowType gtkstyle; - + if(wxstyle & wxBORDER_RAISED) gtkstyle = GTK_SHADOW_OUT; else if (wxstyle & wxBORDER_SUNKEN) @@ -4296,7 +4300,7 @@ void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) else //default gtkstyle = GTK_SHADOW_IN; - gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(w), + gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(w), gtkstyle ); } } diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 8255d6178c..5858c7570c 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk1/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -17,9 +17,13 @@ #include "wx/wxprec.h" #include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/gdicmn.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/memory.h" #include "wx/font.h" diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 38ddd035fa..67dd579b36 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -14,9 +14,12 @@ #include "wx/combobox.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/settings.h" #include "wx/arrstr.h" -#include "wx/intl.h" #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 46a175b093..29094ff240 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk1/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ @@ -10,16 +10,18 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dnd.h" -#include "wx/log.h" +#if wxUSE_DRAG_AND_DROP +#include "wx/dnd.h" -#if wxUSE_DRAG_AND_DROP +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif +#include "wx/log.h" #include "wx/window.h" #include "wx/app.h" #include "wx/gdicmn.h" -#include "wx/intl.h" #include "wx/utils.h" #include "wx/gtk1/private.h" diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index fb9b739398..d912375443 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -10,14 +10,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FONTDLG - -#ifndef __WXGPE__ +#if wxUSE_FONTDLG && !defined(__WXGPE__) #include "wx/fontdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/fontutil.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/debug.h" #include "wx/msgdlg.h" @@ -179,6 +181,4 @@ void wxFontDialog::SetChosenFont(const char *fontname) m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } -#endif // wxUSE_FONTDLG - -#endif // GPE +#endif // wxUSE_FONTDLG && !defined(__WXGPE__) diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 4648ad6b98..e7988ebf58 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -12,20 +12,21 @@ #if wxUSE_LISTBOX +#include "wx/listbox.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" + #include "wx/intl.h" #endif -#include "wx/listbox.h" #include "wx/arrstr.h" #include "wx/utils.h" -#include "wx/intl.h" #include "wx/checklst.h" #include "wx/settings.h" #include "wx/gtk1/private.h" #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" + #include "wx/tooltip.h" #endif #include diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 9f853fcae7..b95b07de75 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -10,14 +10,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_MDI + #include "wx/mdi.h" -#include "wx/notebook.h" -#if wxUSE_MDI +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif +#include "wx/notebook.h" #include "wx/dialog.h" #include "wx/menu.h" -#include "wx/intl.h" #include "wx/gtk1/private.h" #include diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 89b6206f64..502346ec53 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -11,8 +11,12 @@ #include "wx/wxprec.h" #include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/log.h" -#include "wx/intl.h" #include "wx/app.h" #include "wx/bitmap.h" @@ -984,7 +988,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) text = mitem->GetText(); const wxBitmap *bitmap = &mitem->GetBitmap(); - // TODO + // TODO wxUnusedVar(bitmap); menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) ); label = GTK_LABEL( GTK_BIN(menuItem)->child ); diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index ca7fc31f13..6cad559cbd 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/gtk1/notebook.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,14 +10,17 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" -#if wxUSE_NOTEBOOK +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif #include "wx/panel.h" #include "wx/utils.h" #include "wx/imaglist.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/bitmap.h" #include "wx/fontutil.h" @@ -383,13 +386,13 @@ int wxNotebook::GetSelection() const wxString wxNotebook::GetPageText( size_t page ) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid notebook") ); wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return wxT(""); + return wxEmptyString; } int wxNotebook::GetPageImage( size_t page ) const @@ -689,7 +692,7 @@ bool wxNotebook::InsertPage( size_t position, /* set the label text */ nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); + if (nb_page->m_text.empty()) nb_page->m_text = wxT(""); nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 5b6c8cef15..e472846bb0 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -11,8 +11,12 @@ #include "wx/wxprec.h" #include "wx/textctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/math.h" #include "wx/settings.h" diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 2f969d7be8..c9d478b428 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -14,10 +14,10 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/apptrait.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/process.h" diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 828d45afc0..0d8838061d 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -15,6 +15,11 @@ #endif #include "wx/window.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/dcclient.h" #include "wx/frame.h" #include "wx/app.h" @@ -43,7 +48,6 @@ #include "wx/menu.h" #include "wx/statusbr.h" -#include "wx/intl.h" #include "wx/settings.h" #include "wx/log.h" #include "wx/fontutil.h" diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index b128991ff0..b7082817a0 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/mac/carbon/app.cpp // Purpose: wxApp // Author: Stefan Csomor // Modified by: @@ -11,16 +11,20 @@ #include "wx/wxprec.h" +#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/window.h" #include "wx/frame.h" #include "wx/button.h" -#include "wx/app.h" #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/pen.h" #include "wx/brush.h" #include "wx/cursor.h" -#include "wx/intl.h" #include "wx/icon.h" #include "wx/palette.h" #include "wx/dc.h" @@ -359,7 +363,7 @@ struct IdPair int wxId ; } ; -IdPair gCommandIds [] = +IdPair gCommandIds [] = { { kHICommandCut , wxID_CUT } , { kHICommandCopy , wxID_COPY } , @@ -370,10 +374,10 @@ IdPair gCommandIds [] = { kHICommandRedo , wxID_REDO } , } ; -int wxMacCommandToId( UInt32 macCommandId ) +int wxMacCommandToId( UInt32 macCommandId ) { int wxid = 0 ; - + switch ( macCommandId ) { case kHICommandPreferences : @@ -408,10 +412,10 @@ int wxMacCommandToId( UInt32 macCommandId ) return wxid ; } -UInt32 wxIdToMacCommand( int wxId ) +UInt32 wxIdToMacCommand( int wxId ) { UInt32 macId = 0 ; - + if ( wxId == wxApp::s_macPreferencesMenuItemId ) macId = kHICommandPreferences ; else if (wxId == wxApp::s_macExitMenuItemId) @@ -436,7 +440,7 @@ UInt32 wxIdToMacCommand( int wxId ) return macId ; } -wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) +wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) { wxMenu* itemMenu = NULL ; int id = 0 ; @@ -581,7 +585,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler if ( item ) { wxASSERT( itemMenu != NULL ) ; - + switch ( cEvent.GetKind() ) { case kEventProcessCommand : @@ -598,16 +602,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler { wxUpdateUIEvent event(id); event.SetEventObject( itemMenu ); - + bool processed = false; - + // Try the menu's event handler { wxEvtHandler *handler = itemMenu->GetEventHandler(); if ( handler ) processed = handler->ProcessEvent(event); } - + // Try the window the menu was popped up from // (and up through the hierarchy) if ( !processed ) @@ -621,11 +625,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler processed = win->GetEventHandler()->ProcessEvent(event); break; } - + menu = menu->GetParent(); } } - + if ( processed ) { // if anything changed, update the changed attribute @@ -1473,10 +1477,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi if ( !focus ) return false ; - bool handled; + bool handled; wxKeyEvent event(wxEVT_KEY_DOWN) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; - + handled = focus->GetEventHandler()->ProcessEvent( event ) ; if ( handled && event.GetSkipped() ) handled = false ; @@ -1515,7 +1519,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier wxKeyEvent event( wxEVT_KEY_UP ) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ; - + return handled ; } @@ -1523,7 +1527,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers { if ( !focus ) return false ; - + wxKeyEvent event(wxEVT_CHAR) ; MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ; long keyval = event.m_keyCode ; @@ -1531,7 +1535,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers bool handled = false ; wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ; - + if (tlw) { event.SetEventType( wxEVT_CHAR_HOOK ); @@ -1546,7 +1550,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers event.Skip( false ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ; } - + if ( !handled && (keyval == WXK_TAB) ) { wxWindow* iter = focus->GetParent() ; @@ -1601,7 +1605,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers return handled ; } -// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. +// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) { short keycode, keychar ; diff --git a/src/mac/carbon/cfsocket.cpp b/src/mac/carbon/cfsocket.cpp index 205bc86ad1..d99f05a012 100644 --- a/src/mac/carbon/cfsocket.cpp +++ b/src/mac/carbon/cfsocket.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/app.h" @@ -30,7 +31,6 @@ #include "wx/utils.h" #include "wx/module.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/event.h" #include "wx/sckaddr.h" diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp index 3df3a92fd1..f884aae4f7 100644 --- a/src/mac/carbon/clipbrd.cpp +++ b/src/mac/carbon/clipbrd.cpp @@ -14,13 +14,17 @@ #if wxUSE_CLIPBOARD +#include "wx/clipbrd.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/frame.h" #include "wx/bitmap.h" #include "wx/utils.h" #include "wx/metafile.h" -#include "wx/clipbrd.h" -#include "wx/intl.h" #include "wx/log.h" #ifndef __DARWIN__ diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp index f617d26f1c..f572edfe55 100644 --- a/src/mac/carbon/dataobj.cpp +++ b/src/mac/carbon/dataobj.cpp @@ -14,12 +14,13 @@ #if wxUSE_DATAOBJ +#include "wx/dataobj.h" + #ifndef WX_PRECOMP -#include "wx/intl.h" + #include "wx/intl.h" #endif #include "wx/log.h" -#include "wx/dataobj.h" #include "wx/dcmemory.h" #include "wx/mstream.h" #include "wx/image.h" diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index 5e129eaf91..ec4c14e7f4 100644 --- a/src/mac/carbon/filedlg.cpp +++ b/src/mac/carbon/filedlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.cpp +// Name: src/mac/carbon/filedlg.cpp // Purpose: wxFileDialog // Author: Stefan Csomor // Modified by: @@ -11,11 +11,15 @@ #include "wx/wxprec.h" +#include "wx/filedlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" -#include "wx/filedlg.h" -#include "wx/intl.h" #include "wx/tokenzr.h" #include "wx/filename.h" @@ -157,7 +161,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) // an explanatory text, in that case the first part is name and extension at the same time wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ; - if ( current.IsEmpty() ) + if ( current.empty() ) myData->extensions.Add( myData->name[filterIndex] ) ; else myData->extensions.Add( current.MakeUpper() ) ; @@ -179,7 +183,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter ) // Remove leading '.' if (extension.length() && (extension.GetChar(0) == '.')) extension = extension.Mid( 1 ); - + if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator )) myData->filtermactypes.Add( (OSType)fileType ); else @@ -364,7 +368,7 @@ int wxFileDialog::ShowModal() { // let the user select bundles/programs in dialogs dialogCreateOptions.optionFlags |= kNavSupportPackages; - + navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback); err = ::NavCreateGetFileDialog( &dialogCreateOptions, @@ -413,7 +417,7 @@ int wxFileDialog::ShowModal() thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName ); else thePath = wxMacFSRefToPath( &theFSRef ); - + if (!thePath) { ::NavDisposeReply(&navReply); @@ -436,4 +440,3 @@ int wxFileDialog::ShowModal() return (err == noErr) ? wxID_OK : wxID_CANCEL; } - diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm index 79a4c20fe8..043439c64f 100644 --- a/src/mac/carbon/fontdlgosx.mm +++ b/src/mac/carbon/fontdlgosx.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.cpp +// Name: src/mac/carbon/fontdlgosx.cpp // Purpose: wxFontDialog class. // Author: Ryan Norton // Modified by: @@ -9,6 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + // =========================================================================== // declarations // =========================================================================== @@ -17,11 +19,16 @@ // headers // --------------------------------------------------------------------------- -#include "wx/cmndata.h" #include "wx/fontdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + +#include "wx/cmndata.h" #include "wx/fontutil.h" #include "wx/log.h" - + // ============================================================================ // implementation // ============================================================================ @@ -36,10 +43,9 @@ #import #include "wx/mac/uma.h" -#include "wx/intl.h" @interface wxMacFontPanelAccView : NSView -{ +{ BOOL m_okPressed ; BOOL m_shouldClose ; NSButton* m_cancelButton ; @@ -58,13 +64,13 @@ - (id)initWithFrame:(NSRect)rectBox { [super initWithFrame:rectBox]; - + wxMacCFStringHolder cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() ); wxMacCFStringHolder cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() ); NSRect rectCancel = NSMakeRect( 10.0 , 10.0 , 82 , 24 ); NSRect rectOK = NSMakeRect( 100.0 , 10.0 , 82 , 24 ); - + NSButton* cancelButton = [[NSButton alloc] initWithFrame:rectCancel]; [cancelButton setTitle:(NSString*)cfCancelString.Detach()]; [cancelButton setBezelStyle:NSRoundedBezelStyle]; @@ -72,7 +78,7 @@ [cancelButton setAction:@selector(cancelPressed:)]; [cancelButton setTarget:self]; m_cancelButton = cancelButton ; - + NSButton* okButton = [[NSButton alloc] initWithFrame:rectOK]; [okButton setTitle:(NSString*)cfOkString.Detach()]; [okButton setBezelStyle:NSRoundedBezelStyle]; @@ -86,7 +92,7 @@ [self addSubview:cancelButton]; [self addSubview:okButton]; - + [self resetFlags]; return self; } @@ -94,7 +100,7 @@ - (void)resetFlags { m_okPressed = NO ; - m_shouldClose = NO ; + m_shouldClose = NO ; } - (IBAction)cancelPressed:(id)sender @@ -145,22 +151,22 @@ int RunMixedFontDialog(wxFontDialog* dialog) WindowRef carbonWindowRef = (WindowRef)[fontPanel windowRef] ; SetWindowModality(carbonWindowRef, kWindowModalityAppModal , 0) ; SetWindowGroup(carbonWindowRef , GetWindowGroupOfClass(kMovableModalWindowClass)); - + [fontPanel setFloatingPanel:NO] ; [[fontPanel standardWindowButton:NSWindowCloseButton] setEnabled:NO] ; - + wxMacFontPanelAccView* accessoryView = (wxMacFontPanelAccView*) [fontPanel accessoryView] ; if ( accessoryView == nil) { NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 ); accessoryView = [[wxMacFontPanelAccView alloc] initWithFrame:rectBox]; [fontPanel setAccessoryView:accessoryView]; - + [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ; } [accessoryView resetFlags]; - + NSModalSession session = [NSApp beginModalSessionForWindow:fontPanel]; [NSApp runModalSession:session]; @@ -171,7 +177,7 @@ int RunMixedFontDialog(wxFontDialog* dialog) [[fontPanel standardWindowButton:NSWindowCloseButton] setEnabled:YES] ; if( FPIsFontPanelVisible()) FPShowHideFontPanel() ; - + if ( [accessoryView closedWithOk]) { retval = wxID_OK ; @@ -223,7 +229,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) - (BOOL)windowShouldClose:(id)sender { m_bIsClosed = true; - + [NSApp abortModal]; [NSApp stopModal]; return YES; @@ -269,7 +275,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) { m_bIsClosed = true; m_bIsOpen = false; - + [NSApp abortModal]; [NSApp stopModal]; return YES; @@ -321,14 +327,14 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) m_fontData = data; // - // This is the key call - this initializes - // events and window stuff for cocoa for carbon - // applications. + // This is the key call - this initializes + // events and window stuff for cocoa for carbon + // applications. // - // This is also the only call here that is - // 10.2+ specific (the rest is OSX only), - // which, ironically, the carbon font - // panel requires. + // This is also the only call here that is + // 10.2+ specific (the rest is OSX only), + // which, ironically, the carbon font + // panel requires. // bool bOK = NSApplicationLoad(); @@ -338,20 +344,20 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) //Get the initial wx font wxFont& thewxfont = m_fontData.m_initialFont; - - //if the font is valid set the default (selected) font of the + + //if the font is valid set the default (selected) font of the //NSFontDialog to that font if (thewxfont.Ok()) { NSFontTraitMask theMask = 0; - + if(thewxfont.GetStyle() == wxFONTSTYLE_ITALIC) theMask |= NSItalicFontMask; - + if(thewxfont.IsFixedWidth()) theMask |= NSFixedPitchFontMask; - NSFont* theDefaultFont = + NSFont* theDefaultFont = [[NSFontManager sharedFontManager] fontWithFamily: wxNSStringWithWxString(thewxfont.GetFaceName()) traits:theMask @@ -359,7 +365,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) thewxfont.GetWeight() == wxLIGHT ? 0 : 5 size: (float)(thewxfont.GetPointSize()) ]; - + wxASSERT_MSG(theDefaultFont, wxT("Invalid default font for wxCocoaFontDialog!")); //Apple docs say to call NSFontManager::setSelectedFont @@ -377,17 +383,17 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data) alpha:1.0] ]; else - [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; - + [[NSColorPanel sharedColorPanel] setColor:[NSColor blackColor]]; + //We're done - free up the pool [thePool release]; - + return bOK; } int wxFontDialog::ShowModal() -{ - //Start the pool. Required for carbon interaction +{ + //Start the pool. Required for carbon interaction //(For those curious, the only thing that happens //if you don't do this is a bunch of error //messages about leaks on the console, @@ -396,7 +402,7 @@ int wxFontDialog::ShowModal() thePool = [[NSAutoreleasePool alloc] init]; //Get the shared color and font panel - NSFontPanel* theFontPanel = [NSFontPanel sharedFontPanel]; + NSFontPanel* theFontPanel = [NSFontPanel sharedFontPanel]; NSColorPanel* theColorPanel = [NSColorPanel sharedColorPanel]; //Create and assign the delegates (cocoa event handlers) so @@ -406,17 +412,17 @@ int wxFontDialog::ShowModal() wxWCODelegate* theCPDelegate = [[wxWCODelegate alloc] init]; [theColorPanel setDelegate:theCPDelegate]; - + // - // Begin the modal loop for the font and color panels + // Begin the modal loop for the font and color panels // - // The idea is that we first make the font panel modal, + // The idea is that we first make the font panel modal, // but if the color panel is opened, unless we stop the // modal loop the color panel opens behind the font panel // with no input acceptable to it - which makes it useless. // - // So we set up delegates for both the color and font panels, - // and the if the font panel opens the color panel, we + // So we set up delegates for both the color and font panels, + // and the if the font panel opens the color panel, we // stop the modal loop, and start a separate modal loop for // the color panel until the color panel closes, switching // back to the font panel modal loop once it does close. @@ -424,31 +430,31 @@ int wxFontDialog::ShowModal() do { // - // Start the font panel modal loop + // Start the font panel modal loop // NSModalSession session = [NSApp beginModalSessionForWindow:theFontPanel]; - for (;;) + for (;;) { [NSApp runModalSession:session]; - + //If the font panel is closed or the font panel //opened the color panel, break if ([theFPDelegate isClosed] || [theCPDelegate isOpen]) break; } [NSApp endModalSession:session]; - + //is the color panel open? if ([theCPDelegate isOpen]) { // - // Start the color panel modal loop + // Start the color panel modal loop // NSModalSession session = [NSApp beginModalSessionForWindow:theColorPanel]; - for (;;) + for (;;) { [NSApp runModalSession:session]; - + //If the color panel is closed, return the font panel modal loop if ([theCPDelegate isClosed]) break; @@ -459,50 +465,50 @@ int wxFontDialog::ShowModal() //out of its modal loop because the color panel was //opened) return the font panel modal loop }while([theFPDelegate isClosed] == NO); - + //free up the memory for the delegates - we don't need them anymore [theFPDelegate release]; [theCPDelegate release]; - + //Get the font the user selected - NSFont* theFont = [theFontPanel panelConvertFont:[NSFont userFontOfSize:0]]; - + NSFont* theFont = [theFontPanel panelConvertFont:[NSFont userFontOfSize:0]]; + //Get more information about the user's chosen font NSFontTraitMask theTraits = [[NSFontManager sharedFontManager] traitsOfFont:theFont]; int theFontWeight = [[NSFontManager sharedFontManager] weightOfFont:theFont]; int theFontSize = (int) [theFont pointSize]; - + //Set the wx font to the appropriate data if(theTraits & NSFixedPitchFontMask) m_fontData.m_chosenFont.SetFamily(wxTELETYPE); - + m_fontData.m_chosenFont.SetFaceName(wxStringWithNSString([theFont familyName])); m_fontData.m_chosenFont.SetPointSize(theFontSize); m_fontData.m_chosenFont.SetStyle(theTraits & NSItalicFontMask ? wxFONTSTYLE_ITALIC : 0); m_fontData.m_chosenFont.SetWeight(theFontWeight < 5 ? wxLIGHT : - theFontWeight >= 9 ? wxBOLD : wxNORMAL); - + theFontWeight >= 9 ? wxBOLD : wxNORMAL); + //Get the shared color panel along with the chosen color and set the chosen color NSColor* theColor = [[theColorPanel color] colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; - + m_fontData.m_fontColour.Set((unsigned char) ([theColor redComponent] * 255.0), (unsigned char) ([theColor greenComponent] * 255.0), (unsigned char) ([theColor blueComponent] * 255.0)); //Friendly debug stuff #ifdef FONTDLGDEBUG - wxPrintf(wxT("---Font Panel---\n--NS--\nSize:%f\nWeight:%i\nTraits:%i\n--WX--\nFaceName:%s\nPointSize:%i\nStyle:%i\nWeight:%i\nColor:%i,%i,%i\n---END Font Panel---\n"), - + wxPrintf(wxT("---Font Panel---\n--NS--\nSize:%f\nWeight:%i\nTraits:%i\n--WX--\nFaceName:%s\nPointSize:%i\nStyle:%i\nWeight:%i\nColor:%i,%i,%i\n---END Font Panel---\n"), + (float) theFontSize, theFontWeight, theTraits, - + m_fontData.m_chosenFont.GetFaceName().c_str(), m_fontData.m_chosenFont.GetPointSize(), m_fontData.m_chosenFont.GetStyle(), m_fontData.m_chosenFont.GetWeight(), - m_fontData.m_fontColour.Red(), - m_fontData.m_fontColour.Green(), + m_fontData.m_fontColour.Red(), + m_fontData.m_fontColour.Green(), m_fontData.m_fontColour.Blue() ); #endif diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp index adb3957eca..8ba9f44087 100644 --- a/src/mac/carbon/fontenum.cpp +++ b/src/mac/carbon/fontenum.cpp @@ -14,16 +14,17 @@ #if wxUSE_FONTMAP +#include "wx/fontenum.h" + #ifndef WX_PRECOMP - #include "wx/font.h" + #include "wx/font.h" + #include "wx/intl.h" #endif -#include "wx/fontenum.h" #include "wx/fontutil.h" #include "wx/fontmap.h" #include "wx/fontutil.h" #include "wx/encinfo.h" -#include "wx/intl.h" #include "wx/mac/private.h" @@ -161,4 +162,4 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) return true; } -#endif +#endif // wxUSE_FONTMAP diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp index f0bc491790..f157c63c3c 100644 --- a/src/mac/carbon/mimetmac.cpp +++ b/src/mac/carbon/mimetmac.cpp @@ -32,9 +32,12 @@ #if wxUSE_MIMETYPE +#include "wx/mac/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #if wxUSE_GUI #include "wx/icon.h" @@ -43,10 +46,8 @@ #include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" #include "wx/confbase.h" -#include "wx/mac/mimetype.h" #include "wx/mac/private.h" // other standard headers @@ -818,7 +819,6 @@ pascal OSStatus MoreProcGetProcessTypeSignature( // #include "wx/mac/corefoundation/cfstring.h" -#include "wx/intl.h" //wxLocale for wxCFString #define wxCF_RELEASE true #define wxCF_RETAIN false diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index aa64dc2d0c..8b7fed15a7 100644 --- a/src/mac/carbon/msgdlg.cpp +++ b/src/mac/carbon/msgdlg.cpp @@ -11,9 +11,13 @@ #include "wx/wxprec.h" -#include "wx/app.h" #include "wx/msgdlg.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + +#include "wx/app.h" #include "wx/mac/uma.h" @@ -294,4 +298,3 @@ int wxMessageDialog::ShowModal() return resultbutton; } - diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp index 32147daa8a..01c41c4b50 100644 --- a/src/mac/carbon/sound.cpp +++ b/src/mac/carbon/sound.cpp @@ -19,12 +19,12 @@ #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/log.h" #include "wx/file.h" #include "wx/timer.h" -#include "wx/intl.h" // Carbon QT Implementation Details - // diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 36a9d22ced..fddd31d2bc 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -13,12 +13,17 @@ #if wxUSE_TEXTCTRL +#include "wx/textctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif #ifdef __DARWIN__ - #include - #include + #include + #include #else - #include + #include #endif #include "wx/msgdlg.h" @@ -35,13 +40,11 @@ #include "wx/dc.h" #include "wx/button.h" #include "wx/toplevel.h" -#include "wx/textctrl.h" #include "wx/settings.h" #include "wx/filefn.h" #include "wx/utils.h" #include "wx/sysopt.h" #include "wx/menu.h" -#include "wx/intl.h" #if defined(__BORLANDC__) && !defined(__WIN32__) #include @@ -882,8 +885,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) if ( key == 'a' && event.MetaDown() ) { - SelectAll() ; - + SelectAll() ; + return ; } @@ -1574,11 +1577,11 @@ wxString wxMacMLTEControl::GetStringValue() const (((UniChar*)*theText)[actualSize]) = 0 ; wxMBConvUTF16 converter ; size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ; - wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") ); + wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") ); ptr = new wxChar[noChars + 1] ; noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ; - wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") ); + wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") ); ptr[noChars] = 0 ; HUnlock( theText ) ; #endif diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 0fce7375e4..2a71dd2890 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -6,12 +6,17 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/apptrait.h" @@ -19,8 +24,6 @@ #include "wx/mac/uma.h" #include "wx/font.h" #include "wx/toplevel.h" -#else - #include "wx/intl.h" #endif #include @@ -174,7 +177,7 @@ Boolean IsMetroNubInstalled() kMetroNubUserAPIVersion <= block->apiHiVersion) { // success! - gMetroNubEntry = block; + gMetroNubEntry = block; } } } @@ -744,7 +747,7 @@ void wxMacWakeUp() } if ( err == noErr ) { - + if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) ) return; s_wakeupEvent.SetCurrentTime(); @@ -1425,14 +1428,14 @@ void wxMacControl::ScrollRect( wxRect *r , int dx , int dy ) OSType wxMacCreator = 'WXMC'; OSType wxMacControlProperty = 'MCCT'; -void wxMacControl::SetReferenceInNativeControl() +void wxMacControl::SetReferenceInNativeControl() { void * data = this; verify_noerr( SetControlProperty ( m_controlRef , wxMacCreator,wxMacControlProperty, sizeof(data), &data ) ); } -wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) +wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) { wxMacControl* ctl = NULL; UInt32 actualSize; @@ -1482,10 +1485,10 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc( } pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc( - ControlRef browser, - DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) + ControlRef browser, + DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) { wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); if ( ctl != 0 ) @@ -1500,7 +1503,7 @@ DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL; DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL; wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style) : wxMacControl( peer ) -{ +{ Rect bounds = wxMacGetBoundsForControl( peer, pos, size ); OSStatus err = ::CreateDataBrowserControl( MAC_WXHWND(peer->MacGetTopLevelWindowRef()), @@ -1534,17 +1537,17 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - UInt32 *numItems) const + UInt32 *numItems) const { - return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); + return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); } OSStatus wxMacDataBrowserControl::GetItems( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - Handle items) const + Handle items) const { - return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); + return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); } OSStatus wxMacDataBrowserControl::SetSelectionFlags( DataBrowserSelectionFlags options ) @@ -1588,7 +1591,7 @@ OSStatus wxMacDataBrowserControl::SetCallbacks(const DataBrowserCallbacks *callb return SetDataBrowserCallbacks( m_controlRef, callbacks ); } -OSStatus wxMacDataBrowserControl::UpdateItems( +OSStatus wxMacDataBrowserControl::UpdateItems( DataBrowserItemID container, UInt32 numItems, const DataBrowserItemID *items, @@ -1652,166 +1655,166 @@ OSStatus wxMacDataBrowserControl::GetItemRow( DataBrowserItemID item, DataBrowse return GetDataBrowserTableViewItemRow( m_controlRef, item, row ); } -OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) +OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) { - return SetDataBrowserTableViewRowHeight( m_controlRef , height ); + return SetDataBrowserTableViewRowHeight( m_controlRef , height ); } -OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const +OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const { - return GetDataBrowserTableViewRowHeight( m_controlRef, height ); + return GetDataBrowserTableViewRowHeight( m_controlRef, height ); } - -OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) + +OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) { return SetDataBrowserTableViewItemRowHeight( m_controlRef, item , height ); } -OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const +OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const { return GetDataBrowserTableViewItemRowHeight( m_controlRef, item , height); } -OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const { return GetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) +OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) { return SetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const { return GetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) +OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) { return SetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const +OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const { return GetDataBrowserTableViewColumnCount( m_controlRef, numColumns); } -OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, +OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const { return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position) +OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position) { return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const +OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const { return GetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) +OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) { return SetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const +OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const { return GetDataBrowserSortProperty( m_controlRef , column ); } -OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) +OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) { return SetDataBrowserSortProperty( m_controlRef , column ); } - -OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const + +OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const { return GetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) +OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) { return SetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags *flags ) const +OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags *flags ) const { return GetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags flags ) +OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags flags ) { return SetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) const +OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) const { return GetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) +OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) { - return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); + return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , - Boolean expandableRows ) +OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , + Boolean expandableRows ) { return SetDataBrowserListViewDisclosureColumn( m_controlRef, property, expandableRows); } // ============================================================================ -// Higher-level Databrowser +// Higher-level Databrowser // ============================================================================ // // basing on data item objects // wxMacDataItem::wxMacDataItem() -{ +{ } -wxMacDataItem::~wxMacDataItem() -{ +wxMacDataItem::~wxMacDataItem() +{ } - -bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , - const wxMacDataItem*, + +bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , + const wxMacDataItem*, DataBrowserPropertyID property) const { return false; } -OSStatus wxMacDataItem::GetSetData(wxMacDataItemBrowserControl *owner , +OSStatus wxMacDataItem::GetSetData(wxMacDataItemBrowserControl *owner , DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - bool changeValue ) + bool changeValue ) { return errDataBrowserPropertyNotSupported; } -void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner , +void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemNotification message, DataBrowserItemDataRef itemData ) const { } -wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) : +wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) : wxMacDataBrowserControl( peer, pos, size, style ) -{ +{ m_suppressSelection = false; } - -wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) + +wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) { m_former = browser->SuppressSelection(true); m_browser = browser; @@ -1830,18 +1833,18 @@ bool wxMacDataItemBrowserControl::SuppressSelection( bool suppress ) return former; } -Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) +Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) { wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID; wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID; return CompareItems( itemOne , itemTwo , sortProperty ); } -Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne, - const wxMacDataItem* itemTwo, - DataBrowserPropertyID sortProperty) +Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne, + const wxMacDataItem* itemTwo, + DataBrowserPropertyID sortProperty) { Boolean retval = false; if ( itemOne != NULL ) @@ -1853,7 +1856,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { wxMacDataItem* item = (wxMacDataItem*) itemID; return GetSetItemData(item, property, itemData , changeValue ); @@ -1863,7 +1866,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( wxMacDataItem* item, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { OSStatus err = errDataBrowserPropertyNotSupported; switch( property ) @@ -1877,7 +1880,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( if ( item != NULL ) err = item->GetSetData( this, property , itemData , changeValue ); break; - + } return err; } @@ -1885,36 +1888,36 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( void wxMacDataItemBrowserControl::ItemNotification( DataBrowserItemID itemID, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { - wxMacDataItem* item = (wxMacDataItem*) itemID; + wxMacDataItem* item = (wxMacDataItem*) itemID; ItemNotification( item , message, itemData); } void wxMacDataItemBrowserControl::ItemNotification( const wxMacDataItem* item, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { if (item != NULL) item->Notification( this, message, itemData); } -unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state) const +unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, + bool recurse , DataBrowserItemState state) const { UInt32 numItems = 0; - verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, - recurse, state, &numItems ) ); + verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, + recurse, state, &numItems ) ); return numItems; } -void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const +void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container, + bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const { Handle handle = NewHandle(0); - verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container , - recurse , state, handle) ); + verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container , + recurse , state, handle) ); int itemCount = GetHandleSize(handle)/sizeof(DataBrowserItemID); HLock( handle ); @@ -1940,17 +1943,17 @@ wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) con DataBrowserItemID id; OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id); wxASSERT( err == noErr); - return (wxMacDataItem*) id; + return (wxMacDataItem*) id; } -void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item , DataBrowserPropertyID property) const { - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, + verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty /* notSorted */, property ) ); } -void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray , DataBrowserPropertyID property) const { unsigned int noItems = itemArray.GetCount(); @@ -1958,66 +1961,66 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems, + verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems, items, kDataBrowserItemNoProperty /* notSorted */, property ) ); delete [] items; } void wxMacDataItemBrowserControl::AddItem(wxMacDataItem *container, wxMacDataItem *item) { - verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ) ); } -void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray ) +void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray ) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems, (DataBrowserItemID*) items, kDataBrowserItemNoProperty ) ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) +void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) { - OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, (UInt32*) &item, kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray) +void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, (UInt32*) items, kDataBrowserItemNoProperty ); verify_noerr( err ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) +void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) { OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 0 , NULL , kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 1, (DataBrowserItemID*) &item, option )); } -void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 0 , NULL , option )); } -void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; @@ -2033,17 +2036,17 @@ Boolean wxMacDataItemBrowserControl::IsItemSelected( const wxMacDataItem* item) return wxMacDataBrowserControl::IsItemSelected( (DataBrowserItemID) item); } -void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) +void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) { verify_noerr(wxMacDataBrowserControl::RevealItem( (DataBrowserItemID) item, kDataBrowserNoItem , options ) ); } -void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const +void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const { - verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); + verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); } - + // // Tab Control @@ -2121,7 +2124,7 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") ); // we opened the profile so it is up to us to close it - CMCloseProfile(genericRGBProfile); + CMCloseProfile(genericRGBProfile); } } } diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index 3cfa9de109..a0c2589571 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -15,16 +15,20 @@ #pragma hdrstop #endif +#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/window.h" #include "wx/frame.h" #include "wx/button.h" -#include "wx/app.h" #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/pen.h" #include "wx/brush.h" #include "wx/cursor.h" -#include "wx/intl.h" #include "wx/icon.h" #include "wx/palette.h" #include "wx/dc.h" diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp index 81fe955bf5..146534dfd2 100644 --- a/src/mac/classic/clipbrd.cpp +++ b/src/mac/classic/clipbrd.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: src/mac/classic/clipbrd.cpp // Purpose: Clipboard functionality // Author: Stefan Csomor // Modified by: @@ -9,13 +9,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + +#include "wx/clipbrd.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/frame.h" #include "wx/bitmap.h" #include "wx/utils.h" #include "wx/metafile.h" -#include "wx/clipbrd.h" -#include "wx/intl.h" #include "wx/log.h" #ifndef __DARWIN__ @@ -240,7 +246,7 @@ bool wxClipboard::AddData( wxDataObject *data ) size_t sz = data->GetDataSize( array[i] ) ; void* buf = malloc( sz + 1 ) ; if ( buf ) - { + { data->GetDataHere( array[i] , buf ) ; OSType mactype = 0 ; switch ( array[i].GetType() ) @@ -281,15 +287,15 @@ void wxClipboard::Close() wxCHECK_RET( m_open, wxT("clipboard not open") ); m_open = false ; - - // Get rid of cached object. If this is not done copying from another application will - // only work once + + // Get rid of cached object. If this is not done copying from another application will + // only work once if (m_data) { delete m_data; m_data = (wxDataObject*) NULL; - } - + } + } bool wxClipboard::IsSupported( const wxDataFormat &dataFormat ) diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp index 7ebc988bca..56f87a0735 100644 --- a/src/mac/classic/filedlg.cpp +++ b/src/mac/classic/filedlg.cpp @@ -15,11 +15,15 @@ #pragma hdrstop #endif +#include "wx/filedlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/utils.h" #include "wx/dialog.h" -#include "wx/filedlg.h" -#include "wx/intl.h" #include "wx/tokenzr.h" #include "wx/filename.h" diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp index 40dd00318d..fa8a5fc51b 100644 --- a/src/mac/classic/mimetmac.cpp +++ b/src/mac/classic/mimetmac.cpp @@ -16,9 +16,12 @@ #pragma hdrstop #endif +#include "wx/mac/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #if wxUSE_GUI #include "wx/icon.h" #endif @@ -27,11 +30,8 @@ #include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" #include "wx/confbase.h" -#include "wx/mac/mimetype.h" - // other standard headers #include diff --git a/src/mac/classic/msgdlg.cpp b/src/mac/classic/msgdlg.cpp index bbb4cca7df..787ba68f6c 100644 --- a/src/mac/classic/msgdlg.cpp +++ b/src/mac/classic/msgdlg.cpp @@ -9,9 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/msgdlg.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + +#include "wx/app.h" #include "wx/mac/uma.h" IMPLEMENT_CLASS(wxMessageDialog, wxDialog) @@ -255,4 +262,3 @@ int wxMessageDialog::ShowModal() return resultbutton ; } - diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp index f5a8ff1bd5..d5e2c91cfb 100644 --- a/src/mac/classic/utils.cpp +++ b/src/mac/classic/utils.cpp @@ -6,20 +6,23 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" #include "wx/apptrait.h" #if wxUSE_GUI #include "wx/mac/uma.h" #include "wx/font.h" -#else - #include "wx/intl.h" #endif #include @@ -1218,7 +1221,7 @@ void wxMacConvertNewlines10To13( char * data ) void wxMacConvertNewlines13To10( wxString * data ) { - size_t len = data->Length() ; + size_t len = data->length() ; if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL) return ; @@ -1232,9 +1235,9 @@ void wxMacConvertNewlines13To10( wxString * data ) void wxMacConvertNewlines10To13( wxString * data ) { - size_t len = data->Length() ; + size_t len = data->length() ; - if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL) + if ( data->empty() || wxStrchr(data->c_str(),0x0a)==NULL) return ; wxString temp(*data) ; diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index 39206d2f38..89014b388e 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -14,13 +14,17 @@ #endif #include "wx/bitmap.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/icon.h" #include "wx/filefn.h" #include "wx/image.h" #include "wx/dcmemory.h" #include "wx/utils.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/image.h" #include "wx/xpmdecod.h" diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index 5fdf62fae9..97e4f7c7e2 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -15,10 +15,14 @@ #endif #include "wx/cursor.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/module.h" #include "wx/utils.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/hashmap.h" #include "wx/mgl/private.h" diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp index d722788098..415af9a973 100644 --- a/src/mgl/utils.cpp +++ b/src/mgl/utils.cpp @@ -18,9 +18,9 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif -#include "wx/intl.h" #include "wx/apptrait.h" #include "wx/log.h" #include "wx/process.h" diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 8b52088724..e172402295 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -23,8 +23,9 @@ #pragma hdrstop #endif +#include "wx/window.h" + #ifndef WX_PRECOMP - #include "wx/window.h" #include "wx/msgdlg.h" #include "wx/accel.h" #include "wx/dc.h" @@ -32,6 +33,7 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/panel.h" + #include "wx/intl.h" #endif #if wxUSE_DRAG_AND_DROP @@ -41,7 +43,6 @@ #include "wx/log.h" #include "wx/sysopt.h" #include "wx/mgl/private.h" -#include "wx/intl.h" #include "wx/dcscreen.h" #include "wx/caret.h" diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 593f0743bf..61fb696597 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -17,16 +17,17 @@ #define XtDisplay XTDISPLAY #endif +#include "wx/app.h" + #ifndef WX_PRECOMP #include "wx/hash.h" + #include "wx/intl.h" #endif -#include "wx/app.h" #include "wx/utils.h" #include "wx/module.h" #include "wx/memory.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/evtloop.h" #if wxUSE_THREADS diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp index 202c9d2f51..20b664b8df 100644 --- a/src/motif/dnd.cpp +++ b/src/motif/dnd.cpp @@ -13,10 +13,14 @@ #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/window.h" #include "wx/app.h" #include "wx/gdicmn.h" -#include "wx/intl.h" #include "wx/utils.h" #include "wx/log.h" diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index 3ac03441b9..428d1789af 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -18,9 +18,13 @@ #define XtWindow XTWINDOW #endif -#include "wx/utils.h" #include "wx/filedlg.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + +#include "wx/utils.h" #include "wx/app.h" #include "wx/settings.h" #include "wx/tokenzr.h" diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index 95105ec2a8..3ade9492f5 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -33,9 +33,13 @@ #pragma message enable nosimpint #endif -#include "wx/app.h" -#include "wx/intl.h" #include "wx/msgdlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + +#include "wx/app.h" #include "wx/motif/private.h" #include "wx/settings.h" diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp index d3aaab0001..76e2e53686 100644 --- a/src/msdos/mimetype.cpp +++ b/src/msdos/mimetype.cpp @@ -18,9 +18,12 @@ #if wxUSE_MIMETYPE +#include "wx/msdos/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #if wxUSE_GUI #include "wx/icon.h" #endif @@ -28,11 +31,8 @@ #include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" #include "wx/confbase.h" -#include "wx/msdos/mimetype.h" - // other standard headers #include diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp index 0c818dbc80..d20fc302d8 100644 --- a/src/msdos/utilsdos.cpp +++ b/src/msdos/utilsdos.cpp @@ -19,9 +19,9 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif -#include "wx/intl.h" #include "wx/apptrait.h" #include "wx/log.h" #include "wx/process.h" diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 9b1c1a6160..efa5b11d4a 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -30,15 +30,15 @@ #pragma hdrstop #endif +#if wxUSE_WXDIB + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/intl.h" #endif //WX_PRECOMP -#if wxUSE_WXDIB - #include "wx/bitmap.h" -#include "wx/intl.h" #include "wx/file.h" #include @@ -800,4 +800,3 @@ wxImage wxDIB::ConvertToImage() const #endif // wxUSE_IMAGE #endif // wxUSE_WXDIB - diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 95ce39da52..fa0cb61a72 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -21,23 +21,23 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DRAGIMAGE #ifndef WX_PRECOMP -#include -#include "wx/window.h" -#include "wx/dcclient.h" -#include "wx/dcscreen.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" + #include + #include "wx/window.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/intl.h" #endif #include "wx/msw/private.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/frame.h" #include "wx/image.h" @@ -298,8 +298,8 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS if (!m_hCursorImageList) { #ifndef SM_CXCURSOR - // Smartphone may not have these metric symbol - int cxCursor = 16; + // Smartphone may not have these metric symbol + int cxCursor = 16; int cyCursor = 16; #else int cxCursor = ::GetSystemMetrics(SM_CXCURSOR); diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp index 5b5e3541af..69e7c27e11 100644 --- a/src/msw/imaglist.cpp +++ b/src/msw/imaglist.cpp @@ -30,12 +30,12 @@ #include "wx/dc.h" #include "wx/string.h" #include "wx/dcmemory.h" + #include "wx/intl.h" #include #endif #include "wx/log.h" -#include "wx/intl.h" #include "wx/image.h" #include "wx/msw/imaglist.h" diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 9dedef77d5..7e78e570da 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -18,9 +18,12 @@ #if wxUSE_MIMETYPE +#include "wx/msw/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #if wxUSE_GUI #include "wx/icon.h" #include "wx/msgdlg.h" @@ -30,7 +33,6 @@ #include "wx/log.h" #include "wx/file.h" #include "wx/iconloc.h" -#include "wx/intl.h" #include "wx/confbase.h" #ifdef __WXMSW__ @@ -38,8 +40,6 @@ #include "wx/msw/private.h" #endif // OS -#include "wx/msw/mimetype.h" - // other standard headers #include diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index c2aab338a6..d0d050f6f2 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -21,9 +21,9 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif -#include "wx/intl.h" #include "wx/log.h" #include "wx/file.h" #include "wx/wfstream.h" diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 2fbcb7fe52..9099fb4b2b 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -16,17 +16,18 @@ #pragma hdrstop #endif +#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR + +#include "wx/statusbr.h" + #ifndef WX_PRECOMP - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/intl.h" #endif -#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR - -#include "wx/intl.h" #include "wx/log.h" -#include "wx/statusbr.h" #include "wx/msw/private.h" #include diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 3be9dd4b12..416e52c751 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -43,6 +43,7 @@ #include "wx/settings.h" #include "wx/statbox.h" #include "wx/sizer.h" + #include "wx/intl.h" #endif #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) @@ -86,7 +87,6 @@ #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL -#include "wx/intl.h" #include "wx/log.h" #include "wx/textctrl.h" diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp index 7dbd51fc74..e512298a93 100644 --- a/src/os2/mimetype.cpp +++ b/src/os2/mimetype.cpp @@ -14,9 +14,12 @@ #if wxUSE_MIMETYPE +#include "wx/os2/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #if wxUSE_GUI #include "wx/icon.h" #endif @@ -30,11 +33,8 @@ #include "wx/log.h" #include "wx/file.h" #include "wx/iconloc.h" -#include "wx/intl.h" #include "wx/confbase.h" -#include "wx/os2/mimetype.h" - // other standard headers #include diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp index 87d0c0611a..e1dd0bf7d4 100644 --- a/src/os2/thread.cpp +++ b/src/os2/thread.cpp @@ -6,7 +6,6 @@ // Created: 04/22/98 // RCS-ID: $Id$ // Copyright: (c) Stefan Neis (2003) -// // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,15 +18,19 @@ #if wxUSE_THREADS -#include +#include "wx/thread.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif //WX_PRECOMP #include "wx/app.h" #include "wx/apptrait.h" #include "wx/module.h" -#include "wx/intl.h" #include "wx/utils.h" #include "wx/log.h" -#include "wx/thread.h" + +#include #define INCL_DOSSEMAPHORES #define INCL_DOSPROCESS diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp index fe83f29f54..72d7b1cdf2 100644 --- a/src/os2/timer.cpp +++ b/src/os2/timer.cpp @@ -17,10 +17,10 @@ #include "wx/window.h" #include "wx/event.h" #include "wx/app.h" + #include "wx/intl.h" #endif #include "wx/os2/private.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/timer.h" diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 091c160fec..20da3f30ba 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -15,10 +15,10 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" + #include "wx/intl.h" #endif //WX_PRECOMP #include "wx/os2/private.h" -#include "wx/intl.h" #include "wx/apptrait.h" #include diff --git a/src/os2/window.cpp b/src/os2/window.cpp index a63b18648b..d49aaf21a1 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -43,6 +43,7 @@ #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/settings.h" + #include "wx/intl.h" #include #endif @@ -71,7 +72,6 @@ #include "wx/caret.h" #endif // wxUSE_CARET -#include "wx/intl.h" #include "wx/log.h" diff --git a/src/palmos/datectrl.cpp b/src/palmos/datectrl.cpp index ca11de84da..29bc8cbb5e 100644 --- a/src/palmos/datectrl.cpp +++ b/src/palmos/datectrl.cpp @@ -23,14 +23,15 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif - #if wxUSE_DATEPICKCTRL #include "wx/datectrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/app.h" -#include "wx/intl.h" #include "wx/dynlib.h" #define _WX_DEFINE_DATE_EVENTS_ @@ -133,4 +134,3 @@ bool wxDatePickerCtrl::SendClickEvent() } #endif // wxUSE_DATEPICKCTRL - diff --git a/src/palmos/dib.cpp b/src/palmos/dib.cpp index c73eef0219..157bf03f95 100644 --- a/src/palmos/dib.cpp +++ b/src/palmos/dib.cpp @@ -24,15 +24,15 @@ #pragma hdrstop #endif +#if wxUSE_WXDIB + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/log.h" + #include "wx/intl.h" #endif //WX_PRECOMP -#if wxUSE_WXDIB - #include "wx/bitmap.h" -#include "wx/intl.h" #include "wx/file.h" #include "wx/image.h" @@ -167,4 +167,3 @@ wxImage wxDIB::ConvertToImage() const #endif // wxUSE_IMAGE #endif // wxUSE_WXDIB - diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp index 4b6275a500..06340720e1 100644 --- a/src/palmos/dragimag.cpp +++ b/src/palmos/dragimag.cpp @@ -27,16 +27,16 @@ #if wxUSE_DRAGIMAGE #ifndef WX_PRECOMP -#include -#include "wx/window.h" -#include "wx/dcclient.h" -#include "wx/dcscreen.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" + #include + #include "wx/window.h" + #include "wx/dcclient.h" + #include "wx/dcscreen.h" + #include "wx/dcmemory.h" + #include "wx/settings.h" + #include "wx/intl.h" #endif #include "wx/log.h" -#include "wx/intl.h" #include "wx/frame.h" #include "wx/image.h" diff --git a/src/palmos/imaglist.cpp b/src/palmos/imaglist.cpp index d07ac4bf67..1a8d5c5df9 100644 --- a/src/palmos/imaglist.cpp +++ b/src/palmos/imaglist.cpp @@ -30,10 +30,10 @@ #include "wx/dc.h" #include "wx/string.h" #include "wx/dcmemory.h" + #include "wx/intl.h" #endif #include "wx/log.h" -#include "wx/intl.h" #include "wx/palmos/imaglist.h" #include "wx/palmos/private.h" @@ -135,4 +135,3 @@ bool wxImageList::Draw(int index, { return false; } - diff --git a/src/palmos/statbrpalm.cpp b/src/palmos/statbrpalm.cpp index 149ac43fa0..ec0cdb9048 100644 --- a/src/palmos/statbrpalm.cpp +++ b/src/palmos/statbrpalm.cpp @@ -16,17 +16,18 @@ #pragma hdrstop #endif +#if wxUSE_NATIVE_STATUSBAR + +#include "wx/statusbr.h" + #ifndef WX_PRECOMP #include "wx/frame.h" #include "wx/settings.h" #include "wx/dcclient.h" + #include "wx/intl.h" #endif -#if wxUSE_NATIVE_STATUSBAR - -#include "wx/intl.h" #include "wx/log.h" -#include "wx/statusbr.h" #include diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index fb7272487a..39f2c7019b 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -41,6 +41,7 @@ #include "wx/msgdlg.h" #include "wx/settings.h" #include "wx/statbox.h" + #include "wx/intl.h" #endif #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) @@ -72,7 +73,6 @@ #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL -#include "wx/intl.h" #include "wx/log.h" #include "wx/textctrl.h" diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp index 84dbc72288..0d05379693 100644 --- a/src/richtext/richtextxml.cpp +++ b/src/richtext/richtextxml.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtext/richtextxml.cpp +// Name: src/richtext/richtextxml.cpp // Purpose: XML and HTML I/O for wxRichTextCtrl // Author: Julian Smart // Modified by: @@ -21,7 +21,8 @@ #include "wx/richtext/richtextxml.h" #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/wx.h" + #include "wx/intl.h" #endif #include "wx/filename.h" @@ -31,7 +32,6 @@ #include "wx/module.h" #include "wx/txtstrm.h" #include "wx/xml/xml.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler) @@ -123,13 +123,13 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node) wxString text2 = textChild->GetContent(); // Strip whitespace from end - if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('\n')) - text2 = text2.Mid(0, text2.Length()-1); + if (!text2.empty() && text2[text2.length()-1] == wxT('\n')) + text2 = text2.Mid(0, text2.length()-1); - if (text2.Length() > 0 && text2[0] == wxT('"')) + if (!text2.empty() && text2[0] == wxT('"')) text2 = text2.Mid(1); - if (text2.Length() > 0 && text2[text2.Length()-1] == wxT('"')) - text2 = text2.Mid(0, text2.Length() - 1); + if (!text2.empty() && text2[text2.length()-1] == wxT('"')) + text2 = text2.Mid(0, text2.length() - 1); text += text2; } @@ -175,7 +175,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node) wxStringInputStream strStream(data); - imageObj->GetImageBlock().ReadHex(strStream, data.Length(), imageType); + imageObj->GetImageBlock().ReadHex(strStream, data.length(), imageType); } } child = child->GetNext(); @@ -307,7 +307,7 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str, for (i = 0; i < len; i++) { c = str.GetChar(i); - + // Original code excluded "&" but we _do_ want to convert // the ampersand beginning & because otherwise when read in, // the original "&" becomes "&". @@ -388,7 +388,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& #endif // If SetEncoding has been called, change the output encoding. - if (!m_encoding.IsEmpty() && m_encoding.Lower() != fileEncoding.Lower()) + if (!m_encoding.empty() && m_encoding.Lower() != fileEncoding.Lower()) { if (m_encoding == wxT("")) { @@ -400,7 +400,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& } // GetSystemEncodingName may not have returned a name - if (fileEncoding.IsEmpty()) + if (fileEncoding.empty()) #if wxUSE_UNICODE fileEncoding = wxT("UTF-8"); #else @@ -430,7 +430,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& if (deleteConvFile) delete convFile; - + return success; } @@ -461,7 +461,7 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem, OutputString(stream, style + wxT(">"), convMem, convFile); wxString str = text.GetText(); - if (str.Length() > 0 && (str[0] == wxT(' ') || str[str.Length()-1] == wxT(' '))) + if (!str.empty() && (str[0] == wxT(' ') || str[str.length()-1] == wxT(' '))) { OutputString(stream, wxT("\""), convMem, convFile); OutputStringEnt(stream, str, convMem, convFile); @@ -683,6 +683,6 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is #endif // wxUSE_STREAMS - + #endif // wxUSE_RICHTEXT && wxUSE_XML diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index 591584644c..2b39c34e0b 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -14,19 +14,20 @@ #if wxUSE_DIALUP_MANAGER +#include "wx/dialup.h" + #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif // !PCH #include "wx/event.h" -#include "wx/dialup.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/intl.h" #include "wx/app.h" #include "wx/wxchar.h" diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index b42d4462a0..53dba8c959 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -26,16 +26,17 @@ #if wxUSE_DISPLAY +#include "wx/display.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/gdicmn.h" #include "wx/string.h" #include "wx/utils.h" + #include "wx/intl.h" #endif /* WX_PRECOMP */ -#include "wx/display.h" #include "wx/display_impl.h" -#include "wx/intl.h" #include "wx/log.h" /* These must be included after the wx files. Otherwise the Data macro in diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index aa2d4f3d63..ab1cd8db14 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -38,14 +38,16 @@ #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE +#include "wx/unix/mimetype.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/string.h" + #include "wx/intl.h" #endif #include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" #include "wx/confbase.h" #include "wx/ffile.h" @@ -56,8 +58,6 @@ #include "wx/iconloc.h" #include "wx/filename.h" -#include "wx/unix/mimetype.h" - #if wxUSE_LIBGNOMEVFS // Not GUI dependent #include "wx/gtk/gnome/gvfs.h" diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index d7237bb471..503b086214 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -26,15 +26,16 @@ #if wxUSE_THREADS +#include "wx/thread.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" + #include "wx/intl.h" #endif -#include "wx/thread.h" #include "wx/module.h" #include "wx/utils.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/timer.h" #include "wx/stopwatch.h" diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 02b49fdc57..869ae2b555 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -18,16 +18,17 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/utils.h" + #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/intl.h" #endif -#include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" #include "wx/apptrait.h" -#include "wx/utils.h" #include "wx/process.h" #include "wx/thread.h" diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 7f7cbe93c0..cbdac795e7 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -12,12 +12,14 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/app.h" + #ifndef WX_PRECOMP #include "wx/hash.h" + #include "wx/intl.h" #endif #include "wx/frame.h" -#include "wx/app.h" #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/icon.h" @@ -26,7 +28,6 @@ #include "wx/module.h" #include "wx/memory.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/evtloop.h" #include "wx/timer.h" #include "wx/filename.h" diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp index 0e39009af8..7589082fc5 100644 --- a/src/x11/dnd.cpp +++ b/src/x11/dnd.cpp @@ -11,16 +11,20 @@ #include "wx/wxprec.h" #if defined(__BORLANDC__) -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/window.h" #include "wx/app.h" #include "wx/gdicmn.h" -#include "wx/intl.h" #include "wx/utils.h" #include "wx/log.h" diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp index a667a5c13a..fc3a12b2fb 100644 --- a/src/x11/textctrl.cpp +++ b/src/x11/textctrl.cpp @@ -7,10 +7,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/textctrl.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/utils.h" -#include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" #include "wx/panel.h" diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index b9421f5ca7..cd33a3a68e 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -19,11 +19,14 @@ #include "wx/xml/xml.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/wfstream.h" #include "wx/datstrm.h" #include "wx/zstream.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/strconv.h" #include "expat.h" // from Expat diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index a92e391c92..c72b37c77a 100644 --- a/src/xrc/xh_chckl.cpp +++ b/src/xrc/xh_chckl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_chckl.cpp +// Name: src/xrc/xh_chckl.cpp // Purpose: XRC resource for wxCheckList // Author: Bob Mitchell // Created: 2000/03/21 @@ -15,13 +15,15 @@ #pragma hdrstop #endif -#if wxUSE_XRC - -#if wxUSE_CHECKLISTBOX +#if wxUSE_XRC && wxUSE_CHECKLISTBOX #include "wx/xrc/xh_chckl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/checklst.h" -#include "wx/intl.h" #include "wx/log.h" IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler) @@ -37,7 +39,7 @@ wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler() XRC_ADD_STYLE(wxLB_ALWAYS_SB); XRC_ADD_STYLE(wxLB_NEEDED_SB); XRC_ADD_STYLE(wxLB_SORT); - + AddWindowStyles(); } @@ -127,6 +129,4 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } -#endif // wxUSE_CHECKLISTBOX - -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index d739ecafb8..a3903f7836 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_choic.cpp +// Name: src/xrc/xh_choic.cpp // Purpose: XRC resource for wxChoice // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,8 +18,12 @@ #if wxUSE_XRC #include "wx/xrc/xh_choic.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/choice.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp index ebae25ee0f..c7a2e255eb 100644 --- a/src/xrc/xh_combo.cpp +++ b/src/xrc/xh_combo.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_combo.cpp +// Name: src/xrc/xh_combo.cpp // Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,8 +18,12 @@ #if wxUSE_XRC && wxUSE_COMBOBOX #include "wx/xrc/xh_combo.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/combobox.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index e7c0c44b8f..c75f55019a 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -18,10 +18,14 @@ #if wxUSE_XRC #include "wx/xrc/xh_dlg.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/dialog.h" #include "wx/frame.h" #include "wx/log.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index d1b7a64227..dc6d8fc298 100644 --- a/src/xrc/xh_frame.cpp +++ b/src/xrc/xh_frame.cpp @@ -18,10 +18,14 @@ #if wxUSE_XRC #include "wx/xrc/xh_frame.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/frame.h" #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE #include "wx/log.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp index ff97088837..300b657a81 100644 --- a/src/xrc/xh_listb.cpp +++ b/src/xrc/xh_listb.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_listb.cpp +// Name: src/xrc/xh_listb.cpp // Purpose: XRC resource for wxListBox // Author: Bob Mitchell & Vaclav Slavik // Created: 2000/07/29 @@ -18,8 +18,12 @@ #if wxUSE_XRC #include "wx/xrc/xh_listb.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/listbox.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp index f87e5141c3..9cb9ee2e7c 100644 --- a/src/xrc/xh_mdi.cpp +++ b/src/xrc/xh_mdi.cpp @@ -18,10 +18,14 @@ #if wxUSE_XRC && wxUSE_MDI #include "wx/xrc/xh_mdi.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/mdi.h" #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE #include "wx/log.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler) @@ -133,4 +137,4 @@ bool wxMdiXmlHandler::CanHandle(wxXmlNode *node) IsOfClass(node, wxT("wxMDIChildFrame"))); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_MDI diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp index f4fccc5b27..7bc108302e 100644 --- a/src/xrc/xh_radbx.cpp +++ b/src/xrc/xh_radbx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_radbx.cpp +// Name: src/xrc/xh_radbx.cpp // Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,8 +18,12 @@ #if wxUSE_XRC && wxUSE_RADIOBOX #include "wx/xrc/xh_radbx.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #include "wx/radiobox.h" -#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 75a8f6d6a1..1579782186 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xmlres.cpp +// Name: src/xrc/xmlres.cpp // Purpose: XRC resources // Author: Vaclav Slavik // Created: 2000/03/05 @@ -17,8 +17,14 @@ #if wxUSE_XRC +#include "wx/xrc/xmlres.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" +#endif + #ifndef __WXWINCE__ -#include + #include #endif #include "wx/dialog.h" @@ -28,7 +34,6 @@ #include "wx/filesys.h" #include "wx/filename.h" #include "wx/log.h" -#include "wx/intl.h" #include "wx/tokenzr.h" #include "wx/fontenum.h" #include "wx/module.h" @@ -39,7 +44,6 @@ #include "wx/settings.h" #include "wx/xml/xml.h" -#include "wx/xrc/xmlres.h" #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords) @@ -1045,7 +1049,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) // find colour using HTML syntax (#RRGGBB) unsigned long tmp = 0; - if (v.Length() != 7 || v[0u] != wxT('#') || + if (v.length() != 7 || v[0u] != wxT('#') || wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) { // the colour doesn't use #RRGGBB format, check if it is symbolic @@ -1183,7 +1187,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param, bool is_dlg; long sx, sy = 0; - is_dlg = s[s.Length()-1] == wxT('d'); + is_dlg = s[s.length()-1] == wxT('d'); if (is_dlg) s.RemoveLast(); if (!s.BeforeFirst(wxT(',')).ToLong(&sx) || @@ -1232,7 +1236,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, bool is_dlg; long sx; - is_dlg = s[s.Length()-1] == wxT('d'); + is_dlg = s[s.length()-1] == wxT('d'); if (is_dlg) s.RemoveLast(); if (!s.ToLong(&sx)) -- 2.45.2