From 57bd4c6031d438f11af0ec540136f49a928b923c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 7 Sep 2006 19:01:45 +0000 Subject: [PATCH] Include wx/msw/wrap*.h according to pch support (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/wrapcctl.h | 2 ++ src/common/appbase.cpp | 7 ++-- src/common/cmndata.cpp | 24 ++++++------- src/common/datetime.cpp | 4 ++- src/common/filename.cpp | 11 +++--- src/common/imagbmp.cpp | 7 ++-- src/common/memory.cpp | 16 ++------- src/common/paper.cpp | 5 +-- src/common/prntbase.cpp | 4 ++- src/common/stopwatch.cpp | 11 +++--- src/common/strconv.cpp | 66 +++++++++++++++++++----------------- src/generic/datavgen.cpp | 7 ++-- src/generic/filedlgg.cpp | 4 ++- src/msw/app.cpp | 3 +- src/msw/checklst.cpp | 4 +-- src/msw/colordlg.cpp | 2 +- src/msw/combobox.cpp | 4 +-- src/msw/control.cpp | 4 +-- src/msw/cursor.cpp | 2 +- src/msw/datectrl.cpp | 4 +-- src/msw/dc.cpp | 2 +- src/msw/dcprint.cpp | 2 +- src/msw/dialog.cpp | 3 +- src/msw/display.cpp | 5 ++- src/msw/dragimag.cpp | 4 +-- src/msw/fdrepdlg.cpp | 5 ++- src/msw/filedlg.cpp | 6 ++-- src/msw/fontdlg.cpp | 3 +- src/msw/frame.cpp | 4 +-- src/msw/gauge95.cpp | 4 +-- src/msw/imaglist.cpp | 4 +-- src/msw/iniconf.cpp | 21 +++++------- src/msw/listctrl.cpp | 4 +-- src/msw/menu.cpp | 4 +-- src/msw/notebook.cpp | 30 ++++++++-------- src/msw/ole/access.cpp | 3 +- src/msw/ole/droptgt.cpp | 4 +-- src/msw/ole/uuid.cpp | 4 +-- src/msw/printdlg.cpp | 3 +- src/msw/printwin.cpp | 2 +- src/msw/registry.cpp | 11 +++--- src/msw/settings.cpp | 4 +-- src/msw/slider95.cpp | 4 +-- src/msw/spinbutt.cpp | 2 +- src/msw/spinctrl.cpp | 2 +- src/msw/statbox.cpp | 2 +- src/msw/statbr95.cpp | 4 +-- src/msw/statline.cpp | 9 ++--- src/msw/tabctrl.cpp | 4 +-- src/msw/tbar95.cpp | 4 +-- src/msw/textctrl.cpp | 3 +- src/msw/thread.cpp | 2 +- src/msw/tooltip.cpp | 6 ++-- src/msw/toplevel.cpp | 2 +- src/msw/treectrl.cpp | 7 ++-- src/msw/utils.cpp | 2 +- src/msw/volume.cpp | 2 +- src/msw/wince/checklst.cpp | 4 +-- src/msw/wince/choicece.cpp | 4 +-- src/msw/wince/helpwce.cpp | 13 ++++--- src/msw/wince/net.cpp | 17 ++++++++-- src/msw/wince/tbarwce.cpp | 4 +-- src/msw/wince/textctrlce.cpp | 4 +-- src/msw/window.cpp | 7 ++-- 64 files changed, 185 insertions(+), 246 deletions(-) diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h index 0edf3d96ec..65c17f4d1c 100644 --- a/include/wx/msw/wrapcctl.h +++ b/include/wx/msw/wrapcctl.h @@ -34,6 +34,8 @@ #define _WIN32_IE 0x0600 #endif // !defined(_WIN32_IE) +#include "wx/msw/wrapwin.h" + #include // define things which might be missing from our commctrl.h diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index fa5db01ac9..40706d3aee 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -25,6 +25,9 @@ #endif #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() + #endif #include "wx/list.h" #include "wx/app.h" #include "wx/intl.h" @@ -43,10 +46,6 @@ #include // for SIGTRAP used by wxTrap() #endif //Win/Unix -#if defined(__WXMSW__) - #include "wx/msw/wrapwin.h" // includes windows.h for MessageBox() -#endif - #if wxUSE_FONTMAP #include "wx/fontmap.h" #endif // wxUSE_FONTMAP diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index eb69bdb766..13b30b5579 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -27,6 +27,9 @@ #include "wx/cmndata.h" #ifndef WX_PRECOMP + #if defined(__WXMSW__) + #include "wx/msw/wrapcdlg.h" + #endif // MSW #include #include "wx/string.h" #include "wx/utils.h" @@ -43,26 +46,21 @@ #endif // wxUSE_FONTDLG #if wxUSE_PRINTING_ARCHITECTURE - #include "wx/paper.h" -#endif // wxUSE_PRINTING_ARCHITECTURE - -#if defined(__WXMSW__) - #include "wx/msw/wrapcdlg.h" -#endif // MSW - #if wxUSE_PRINTING_ARCHITECTURE +#include "wx/paper.h" #if defined(__WXMAC__) #include "wx/mac/private/print.h" #endif - IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject) - #endif // wxUSE_PRINTING_ARCHITECTURE +IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject) + +#endif // wxUSE_PRINTING_ARCHITECTURE - IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject) // ============================================================================ // implementation diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 069f1dbee3..4e68a76cd2 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -66,6 +66,9 @@ #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" @@ -79,7 +82,6 @@ #include #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" #include #ifndef __WXWINCE__ #include diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 91451e4452..b4ea82e56a 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -68,6 +68,9 @@ #endif #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" // For GetShort/LongPathName + #endif #include "wx/dynarray.h" #include "wx/intl.h" #include "wx/log.h" @@ -81,12 +84,8 @@ #include "wx/file.h" #include "wx/dynlib.h" -// For GetShort/LongPathName -#ifdef __WIN32__ -#include "wx/msw/wrapwin.h" -#if defined(__MINGW32__) -#include "wx/msw/gccpriv.h" -#endif +#if defined(__WIN32__) && defined(__MINGW32__) + #include "wx/msw/gccpriv.h" #endif #ifdef __WXWINCE__ diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index a500a84a97..0dced8f819 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -17,6 +17,9 @@ #if wxUSE_IMAGE #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/log.h" #include "wx/app.h" #include "wx/bitmap.h" @@ -38,10 +41,6 @@ #endif #endif -#ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" -#endif - //----------------------------------------------------------------------------- // wxBMPHandler //----------------------------------------------------------------------------- diff --git a/src/common/memory.cpp b/src/common/memory.cpp index acd63dcde9..72169f2735 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -21,6 +21,9 @@ #include "wx/memory.h" #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/utils.h" #include "wx/app.h" #include "wx/hash.h" @@ -43,19 +46,6 @@ #include #include -#ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" - -#ifdef GetClassInfo -#undef GetClassInfo -#endif - -#ifdef GetClassName -#undef GetClassName -#endif - -#endif - #if wxUSE_THREADS && defined(__WXDEBUG__) #define USE_THREADSAFE_MEMORY_ALLOCATION 1 #else diff --git a/src/common/paper.cpp b/src/common/paper.cpp index fb2c1ca6d3..bc29b2acc1 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -18,8 +18,10 @@ #if wxUSE_PRINTING_ARCHITECTURE - #ifndef WX_PRECOMP + #if defined(__WXMSW__) + #include "wx/msw/wrapcdlg.h" + #endif // MSW #include "wx/utils.h" #include "wx/settings.h" #include "wx/intl.h" @@ -32,7 +34,6 @@ #include #ifdef __WXMSW__ - #include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index eb1b109583..a06698ac58 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -21,6 +21,9 @@ #include "wx/dcprint.h" #ifndef WX_PRECOMP + #if defined(__WXMSW__) + #include "wx/msw/wrapcdlg.h" + #endif // MSW #include "wx/utils.h" #include "wx/dc.h" #include "wx/app.h" @@ -54,7 +57,6 @@ #endif #ifdef __WXMSW__ - #include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 0739cf0f4b..6e0754d2d0 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/stopwatch.cpp +// Name: src/common/stopwatch.cpp // Purpose: wxStopWatch and other non-GUI stuff from wx/timer.h // Author: // Original version by Julian Smart @@ -31,6 +31,9 @@ #include "wx/stopwatch.h" #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/intl.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -39,10 +42,6 @@ // System headers // ---------------------------------------------------------------------------- -#if defined(__WIN32__) - #include "wx/msw/wrapwin.h" -#endif - #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__) #define HAVE_FTIME #endif @@ -371,5 +370,3 @@ double wxGetLocalTimeMillis(void) } #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG - - diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index b83ff1a340..95ef424042 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -16,6 +16,9 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/missing.h" + #endif #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" @@ -28,7 +31,6 @@ #ifdef __WINDOWS__ #include "wx/msw/private.h" - #include "wx/msw/missing.h" #endif #ifndef __WXWINCE__ @@ -2773,7 +2775,7 @@ public: wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ; } } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2888,9 +2890,9 @@ public: virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); } bool IsOk() const - { + { CreateIfNeeded() ; - return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; + return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; } protected : @@ -2906,13 +2908,13 @@ protected : class wxMBConv_macUTF8D : public wxMBConv_mac { public : - wxMBConv_macUTF8D() + wxMBConv_macUTF8D() { Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ; m_uni = NULL; m_uniBack = NULL ; } - + virtual ~wxMBConv_macUTF8D() { if (m_uni!=NULL) @@ -2920,7 +2922,7 @@ public : if (m_uniBack!=NULL) DisposeUnicodeToTextInfo(&m_uniBack); } - + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const { CreateIfNeeded() ; @@ -2950,15 +2952,15 @@ public : ubuf = (UniChar*) psz ; #endif - // ubuf is a non-decomposed UniChar buffer - + // ubuf is a non-decomposed UniChar buffer + ByteCount dcubuflen = byteInLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; - - ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + + ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ; - + // we now convert that decomposed buffer into UTF8 status = TECConvertText( @@ -2983,7 +2985,7 @@ public : return res ; } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2993,25 +2995,25 @@ public : wchar_t *tbuf = NULL ; UniChar* ubuf = NULL ; size_t res = 0 ; - + if (buf == NULL) { // Apple specs say at least 32 n = wxMax( 32, byteInLen ) ; tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ; } - + ByteCount byteBufferLen = n * sizeof( UniChar ) ; - + #if SIZEOF_WCHAR_T == 4 ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ; #else ubuf = (UniChar*) (buf ? buf : tbuf) ; #endif - + ByteCount dcubuflen = byteBufferLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; status = TECConvertText( m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen, @@ -3019,16 +3021,16 @@ public : // we have to terminate here, because n might be larger for the trailing zero, and if UniChar // is not properly terminated we get random characters at the end dcubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - + // now from the decomposed UniChar to properly composed uniChar - ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , + ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , ubuf ) ; free( dcubuf ); byteOutLen = dcubufwritten ; ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - - + + #if SIZEOF_WCHAR_T == 4 wxMBConvUTF16 converter ; res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ; @@ -3036,13 +3038,13 @@ public : #else res = byteOutLen / sizeof( UniChar ) ; #endif - + if ( buf == NULL ) free(tbuf) ; - + if ( buf && res < n) buf[res] = 0; - + return res ; } @@ -3056,16 +3058,16 @@ public : m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - - OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); + + OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; - + m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeNoSubset, kTextEncodingDefaultFormat); m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalCompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); + err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; } } @@ -3073,7 +3075,7 @@ protected : mutable UnicodeToTextInfo m_uni; mutable UnicodeToTextInfo m_uniBack; mutable UnicodeMapping m_map; -}; +}; #endif // defined(__WXMAC__) && defined(TARGET_CARBON) // ============================================================================ @@ -3340,7 +3342,7 @@ wxMBConv *wxCSConv::DoCreate() const const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding); // CS : in case this does not return valid names (eg for MacRoman) encoding - // got a 'failure' entry in the cache all the same, although it just has to + // got a 'failure' entry in the cache all the same, although it just has to // be created using a different method, so only store failed iconv creation // attempts (or perhaps we shoulnd't do this at all ?) if ( names[0] != NULL ) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 0f48a82300..7d404f3e72 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -21,6 +21,9 @@ #ifdef wxUSE_GENERICDATAVIEWCTRL #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/sizer.h" #include "wx/log.h" #include "wx/dcclient.h" @@ -33,10 +36,6 @@ #include "wx/popupwin.h" #include "wx/renderer.h" -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" -#endif - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index f159065ef9..5264d09285 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -24,6 +24,9 @@ #endif #ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #endif #include "wx/hash.h" #include "wx/intl.h" #include "wx/settings.h" @@ -67,7 +70,6 @@ #endif #ifdef __WINDOWS__ - #include "wx/msw/wrapwin.h" #include "wx/msw/mslu.h" #endif diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 133b9f70b1..d6fc28e390 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" #include "wx/dynarray.h" #include "wx/frame.h" #include "wx/app.h" @@ -76,8 +77,6 @@ #include #include -#include "wx/msw/wrapcctl.h" - // For MB_TASKMODAL #ifdef __WXWINCE__ #include "wx/msw/wince/missing.h" diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 0a9a715488..cf5c5f771e 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -29,6 +29,7 @@ #include "wx/checklst.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" #include "wx/object.h" #include "wx/colour.h" #include "wx/font.h" @@ -36,15 +37,12 @@ #include "wx/window.h" #include "wx/listbox.h" #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/log.h" #endif #include "wx/ownerdrw.h" -#include "wx/msw/wrapwin.h" #include #include "wx/msw/private.h" diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 21d50103f3..66a70b0eb5 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -29,6 +29,7 @@ #include "wx/colordlg.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include #include "wx/colour.h" #include "wx/gdicmn.h" @@ -39,7 +40,6 @@ #endif #include "wx/msw/private.h" -#include "wx/msw/wrapcdlg.h" #include #include diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 6b3ec7f57f..937e23ea06 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -29,6 +29,7 @@ #include "wx/combobox.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/settings.h" #include "wx/log.h" // for wxEVT_COMMAND_TEXT_ENTER @@ -40,9 +41,6 @@ #include "wx/clipbrd.h" #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 73a8f2511a..6572a219c0 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -29,6 +29,7 @@ #include "wx/control.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" @@ -47,9 +48,6 @@ #include "wx/msw/private.h" #include "wx/msw/uxtheme.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 9619122ec0..cdc7992e51 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -27,6 +27,7 @@ #include "wx/cursor.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" // IDC_HAND #include "wx/utils.h" #include "wx/app.h" #include "wx/bitmap.h" @@ -38,7 +39,6 @@ #endif #include "wx/msw/private.h" -#include "wx/msw/missing.h" // IDC_HAND // define functions missing in MicroWin #ifdef __WXMICROWIN__ diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp index 2af227ee9d..ebe60e9318 100644 --- a/src/msw/datectrl.cpp +++ b/src/msw/datectrl.cpp @@ -26,11 +26,11 @@ #if wxUSE_DATEPICKCTRL #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/app.h" #include "wx/intl.h" #include "wx/dcclient.h" - #include "wx/msw/wrapwin.h" - #include "wx/msw/wrapcctl.h" #include "wx/msw/private.h" #endif diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 50e86d027c..4f2367b426 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/image.h" #include "wx/window.h" #include "wx/dc.h" @@ -48,7 +49,6 @@ #include -#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 81687b72fe..a2acc909cb 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -29,6 +29,7 @@ #include "wx/dcprint.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/string.h" #include "wx/log.h" #include "wx/window.h" @@ -45,7 +46,6 @@ #include "wx/printdlg.h" #include "wx/msw/printdlg.h" -#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 8d30e36019..83260301ee 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -27,6 +27,7 @@ #include "wx/dialog.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/utils.h" #include "wx/frame.h" #include "wx/app.h" @@ -41,8 +42,6 @@ #include "wx/evtloop.h" #include "wx/ptr_scpd.h" -#include "wx/msw/wrapcdlg.h" - #if defined(__SMARTPHONE__) && defined(__WXWINCE__) #include "wx/msw/wince/resources.h" #endif // __SMARTPHONE__ && __WXWINCE__ diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 3a0844c3ce..0195c675ff 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -28,13 +28,12 @@ #if wxUSE_DISPLAY #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/dynarray.h" #include "wx/app.h" #include "wx/frame.h" #endif -#include "wx/msw/missing.h" - #include "wx/dynload.h" #include "wx/sysopt.h" @@ -459,7 +458,7 @@ wxRect wxDisplayImplWin32Base::GetClientArea() const wxString wxDisplayImplWin32Base::GetName() const { - if ( m_info.m_devName.IsEmpty() ) + if ( m_info.m_devName.empty() ) m_info.Initialize(); return m_info.m_devName; diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 06675c2b0f..469d3954b0 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -27,6 +27,7 @@ #if wxUSE_DRAGIMAGE #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include #include "wx/window.h" #include "wx/dcclient.h" @@ -48,9 +49,6 @@ #include "wx/msw/wince/missing.h" #endif // __WXWINCE__ -// include "properly" -#include "wx/msw/wrapcctl.h" - // Wine doesn't have this yet #ifndef ListView_CreateDragImage #define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \ diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp index 86c8606c56..fbfd80833d 100644 --- a/src/msw/fdrepdlg.cpp +++ b/src/msw/fdrepdlg.cpp @@ -4,7 +4,7 @@ // Author: Markus Greither and Vadim Zeitlin // Modified by: // Created: 23/03/2001 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Markus Greither // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,11 +27,11 @@ #if wxUSE_FINDREPLDLG #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/intl.h" #include "wx/log.h" #endif -#include "wx/msw/wrapcdlg.h" #include "wx/fdrepdlg.h" // ---------------------------------------------------------------------------- @@ -539,4 +539,3 @@ void wxFindReplaceDialog::DoGetClientSize(int *width, int *height) const } #endif // wxUSE_FINDREPLDLG - diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 76c8f73ecc..7389400e3c 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -29,6 +29,8 @@ #include "wx/filedlg.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" + #include "wx/msw/missing.h" #include "wx/utils.h" #include "wx/msgdlg.h" #include "wx/filefn.h" @@ -38,16 +40,12 @@ #include "wx/math.h" #endif -#include "wx/msw/wrapcdlg.h" - #include #include #include "wx/filename.h" #include "wx/tokenzr.h" -#include "wx/msw/missing.h" - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 72802a232f..51a5bd1b2b 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -29,6 +29,7 @@ #include "wx/fontdlg.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/utils.h" #include "wx/dialog.h" #include "wx/log.h" @@ -36,8 +37,6 @@ #include "wx/math.h" #endif -#include "wx/msw/wrapcdlg.h" - #include #include diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 800cd97d86..c31faeb708 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -27,6 +27,7 @@ #include "wx/frame.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/app.h" #include "wx/menu.h" #include "wx/utils.h" @@ -43,9 +44,6 @@ #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #if defined(__POCKETPC__) || defined(__SMARTPHONE__) #include #include diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index d3e137616b..4d79cb7867 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -29,13 +29,11 @@ #include "wx/gauge.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #endif #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp index d9ffadf717..2b3cfb5c58 100644 --- a/src/msw/imaglist.cpp +++ b/src/msw/imaglist.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/window.h" #include "wx/icon.h" #include "wx/dc.h" @@ -39,9 +40,6 @@ #include "wx/msw/imaglist.h" #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index 6c0617bb2f..cce629bbc2 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -21,13 +21,14 @@ #if wxUSE_CONFIG && !wxUSE_UNICODE #ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/log.h" + #include "wx/msw/wrapwin.h" + #include "wx/dynarray.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/log.h" #endif //WX_PRECOMP #include "wx/config.h" @@ -35,12 +36,6 @@ #include "wx/msw/iniconf.h" -// _WINDOWS_ is defined when windows.h is included, -// __WXMSW__ is defined for MS Windows compilation -#if defined(__WXMSW__) && !defined(_WINDOWS_) - #include "wx/msw/wrapwin.h" -#endif //windows.h - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 6bb6ef1527..c70de88646 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -27,6 +27,7 @@ #if wxUSE_LISTCTRL #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" @@ -48,9 +49,6 @@ #endif #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - // Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines // it by its old name NM_FINDTIEM. // diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 03c844447c..28581bd470 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -29,6 +29,7 @@ #include "wx/menu.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/frame.h" #include "wx/utils.h" #include "wx/intl.h" @@ -41,9 +42,6 @@ #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #ifdef __WXWINCE__ #include #include diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index a7fcdfa202..4ba885a266 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -18,30 +18,28 @@ #if wxUSE_NOTEBOOK -#include "wx/notebook.h" +#include "wx/notebook.h" #ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/dc.h" - #include "wx/log.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" - #include "wx/control.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/string.h" + #include "wx/dc.h" + #include "wx/log.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/control.h" #endif // WX_PRECOMP -#include "wx/imaglist.h" -#include "wx/sysopt.h" +#include "wx/imaglist.h" +#include "wx/sysopt.h" -#include "wx/msw/private.h" +#include "wx/msw/private.h" -#include +#include #include "wx/msw/winundef.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #if wxUSE_UXTHEME #include "wx/msw/uxtheme.h" #endif diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp index e168dda881..15db11c56f 100644 --- a/src/msw/ole/access.cpp +++ b/src/msw/ole/access.cpp @@ -29,12 +29,11 @@ #include "wx/access.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" #include "wx/window.h" #include "wx/log.h" #endif -#include "wx/msw/wrapwin.h" - // for some compilers, the entire ole2.h must be included, not only oleauto.h #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__) #include diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 1301f08d47..84d718ff17 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -27,6 +27,7 @@ #if wxUSE_OLE && wxUSE_DRAG_AND_DROP #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" #include "wx/log.h" #endif @@ -39,9 +40,6 @@ #ifdef __WIN32__ #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS - #if wxCHECK_W32API_VERSION( 1, 0 ) - #include "wx/msw/wrapwin.h" - #endif #include // for DROPFILES structure #endif #else diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp index 06cd373fdd..0b1020d849 100644 --- a/src/msw/ole/uuid.cpp +++ b/src/msw/ole/uuid.cpp @@ -22,10 +22,10 @@ #if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) ) -// standard headers -#if wxCHECK_W32API_VERSION( 1, 0 ) +#ifndef WX_PRECOMP #include "wx/msw/wrapwin.h" #endif + #include // UUID related functions #include "wx/msw/ole/uuid.h" diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 965fa3042e..4fb94bd799 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -29,6 +29,7 @@ #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/app.h" #include "wx/dcprint.h" #include "wx/cmndata.h" @@ -40,8 +41,6 @@ #include -#include "wx/msw/wrapcdlg.h" - #ifndef __WIN32__ #include #endif diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 3721f3ee5a..6856dd9462 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -29,6 +29,7 @@ #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/window.h" #include "wx/msw/private.h" #include "wx/utils.h" @@ -46,7 +47,6 @@ #include -#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index f35ecd279c..59bdc789bf 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -20,17 +20,16 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" #include "wx/string.h" - #include "wx/intl.h" - #include "wx/log.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/file.h" -#include "wx/wfstream.h" +#include "wx/file.h" +#include "wx/wfstream.h" // Windows headers -#include "wx/msw/wrapwin.h" - #ifdef __WXWINCE__ #include "wx/msw/private.h" #include diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 9817d4d7c1..e482e95ff1 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -27,6 +27,7 @@ #include "wx/settings.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC #include "wx/utils.h" #include "wx/gdicmn.h" #include "wx/module.h" @@ -40,9 +41,6 @@ #include "wx/fontutil.h" -// for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC -#include "wx/msw/missing.h" - // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 480e82b600..ef18937374 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -30,14 +30,12 @@ #include "wx/slider.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/brush.h" #endif #include "wx/msw/subwin.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 43141278d6..d4e20e76a5 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/app.h" #endif @@ -35,7 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) #include "wx/msw/private.h" -#include "wx/msw/wrapcctl.h" #ifndef UDM_SETRANGE32 #define UDM_SETRANGE32 (WM_USER+111) diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 16c1f39b1e..58673b0e3b 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -29,12 +29,12 @@ #include "wx/spinctrl.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/event.h" #include "wx/textctrl.h" #endif #include "wx/msw/private.h" -#include "wx/msw/wrapcctl.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index b426f923e4..66403b47bd 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -29,6 +29,7 @@ #include "wx/statbox.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/app.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" @@ -40,7 +41,6 @@ #include "wx/msw/uxtheme.h" #include "wx/msw/private.h" -#include "wx/msw/missing.h" // ---------------------------------------------------------------------------- // wxWin macros diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 3c774a2457..c17ff4cc57 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -21,6 +21,7 @@ #include "wx/statusbr.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/frame.h" #include "wx/settings.h" #include "wx/dcclient.h" @@ -31,9 +32,6 @@ #include "wx/msw/private.h" #include -// include "properly" -#include "wx/msw/wrapcctl.h" - #if wxUSE_UXTHEME #include "wx/msw/uxtheme.h" #endif diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 521b9e04ca..4c902f5398 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/statline.cpp +// Name: src/msw/statline.cpp // Purpose: MSW version of wxStaticLine class // Author: Vadim Zeitlin // Created: 28.06.99 @@ -27,8 +27,10 @@ #if wxUSE_STATLINE -#include "wx/msw/private.h" -#include "wx/msw/missing.h" +#ifndef WX_PRECOMP + #include "wx/msw/private.h" + #include "wx/msw/missing.h" +#endif // ============================================================================ // implementation @@ -127,4 +129,3 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const } #endif // wxUSE_STATLINE - diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index a218e6d923..21eb96131e 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -19,15 +19,13 @@ #if wxUSE_TAB_DIALOG #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/wx.h" #include "wx/app.h" #endif #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - #include "wx/tabctrl.h" #include "wx/msw/imaglist.h" diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 8dff81d4f9..1e93c69901 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -29,6 +29,7 @@ #include "wx/toolbar.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/dynarray.h" #include "wx/frame.h" #include "wx/log.h" @@ -49,9 +50,6 @@ #include "wx/msw/uxtheme.h" #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - // this define controls whether the code for button colours remapping (only // useful for 16 or 256 colour images) is active at all, it's always turned off // for CE where it doesn't compile (and is probably not needed anyhow) and may diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index c331c3c95f..2b41db8590 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -27,6 +27,7 @@ #if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/textctrl.h" #include "wx/settings.h" #include "wx/brush.h" @@ -71,8 +72,6 @@ #include #endif -#include "wx/msw/missing.h" - #endif // wxUSE_RICHEDIT // ---------------------------------------------------------------------------- diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index 462c74137b..b48ed592cd 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -26,6 +26,7 @@ #include "wx/thread.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/intl.h" #include "wx/app.h" #include "wx/module.h" @@ -35,7 +36,6 @@ #include "wx/scopeguard.h" #include "wx/msw/private.h" -#include "wx/msw/missing.h" #include "wx/msw/seh.h" #include "wx/except.h" diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp index b18f806040..aa5388cf2d 100644 --- a/src/msw/tooltip.cpp +++ b/src/msw/tooltip.cpp @@ -28,6 +28,7 @@ #include "wx/tooltip.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/app.h" #include "wx/control.h" #include "wx/combobox.h" @@ -36,9 +37,6 @@ #include "wx/tokenzr.h" #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - // VZ: normally, the trick with subclassing the tooltip control and processing // TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the // code here for now (but it's not compiled) in case we need it later. @@ -347,7 +345,7 @@ void wxToolTip::Add(WXHWND hWnd) } if ( sz.cx > max ) max = sz.cx; - + token = tokenizer.GetNextToken(); } diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index b2af8b2483..97fec59a6a 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -27,6 +27,7 @@ #include "wx/toplevel.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/app.h" #include "wx/dialog.h" #include "wx/string.h" @@ -50,7 +51,6 @@ #include "wx/msw/wince/missing.h" #endif -#include "wx/msw/missing.h" #include "wx/msw/winundef.h" #include "wx/display.h" diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index cafa185031..8a7ce13525 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -29,6 +29,8 @@ #include "wx/treectrl.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/msw/missing.h" #include "wx/dynarray.h" #include "wx/log.h" #include "wx/app.h" @@ -37,11 +39,6 @@ #include "wx/msw/private.h" -// include "properly" -#include "wx/msw/wrapcctl.h" - -#include "wx/msw/missing.h" - // Set this to 1 to be _absolutely_ sure that repainting will work for all // comctl32.dll versions #define wxUSE_COMCTL32_SAFELY 0 diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 1659a50bc7..6eff2fe253 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -25,6 +25,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/msw/missing.h" // CHARSET_HANGUL #include "wx/utils.h" #include "wx/app.h" #include "wx/intl.h" @@ -41,7 +42,6 @@ #include "wx/confbase.h" // for wxExpandEnvVars() #include "wx/msw/private.h" // includes -#include "wx/msw/missing.h" // CHARSET_HANGUL #if defined(__CYGWIN__) //CYGWIN gives annoying warning about runtime stuff if we don't do this diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index 1331da183d..3a1fa48ec1 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -26,6 +26,7 @@ #if wxUSE_FSVOLUME #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #if wxUSE_GUI #include "wx/icon.h" #endif @@ -41,7 +42,6 @@ #include #include -#include "wx/msw/missing.h" #if wxUSE_BASE diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp index d2ce744d1f..24215c91f3 100644 --- a/src/msw/wince/checklst.cpp +++ b/src/msw/wince/checklst.cpp @@ -29,11 +29,9 @@ #include "wx/checklst.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - // ============================================================================ // implementation // ============================================================================ diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index caef2a0388..5540dcca03 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -29,11 +29,9 @@ #include "wx/choice.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - #include "wx/spinbutt.h" // for wxSpinnerBestSize #if wxUSE_EXTENDED_RTTI diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp index 28958bff85..10aed8a102 100644 --- a/src/msw/wince/helpwce.cpp +++ b/src/msw/wince/helpwce.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpwce.h +// Name: src/msw/wince/helpwce.cpp // Purpose: Help system: Windows CE help implementation // Author: Julian Smart // Modified by: @@ -22,11 +22,11 @@ #include "wx/msw/wince/helpwce.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/intl.h" #endif #include "wx/msw/private.h" -#include "wx/msw/missing.h" IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase) @@ -38,7 +38,7 @@ bool wxWinceHelpController::Initialize(const wxString& filename) bool wxWinceHelpController::LoadFile(const wxString& file) { - if (!file.IsEmpty()) + if (!file.empty()) m_helpFile = file; return true; } @@ -93,7 +93,7 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const wxSplitPath(file, & path, & name, & ext); wxString fullName; - if (path.IsEmpty()) + if (path.empty()) fullName = name + wxT(".htm"); else if (path.Last() == wxT('\\')) fullName = path + name + wxT(".htm"); @@ -109,10 +109,10 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const // View URL bool wxWinceHelpController::ViewURL(const wxString& topic) { - if (m_helpFile.IsEmpty()) return false; + if (m_helpFile.empty()) return false; wxString url( wxT("file:") + GetValidFilename(m_helpFile) ); - if (!topic.IsEmpty()) + if (!topic.empty()) url = url + wxT("#") + topic; return CreateProcess(wxT("peghelp.exe"), @@ -121,4 +121,3 @@ bool wxWinceHelpController::ViewURL(const wxString& topic) } #endif // wxUSE_HELP - diff --git a/src/msw/wince/net.cpp b/src/msw/wince/net.cpp index 28545a28c4..2c05380bb6 100644 --- a/src/msw/wince/net.cpp +++ b/src/msw/wince/net.cpp @@ -1,4 +1,13 @@ -// Copyright 1998, Ben Goetter. All rights reserved. +/////////////////////////////////////////////////////////////////////////////// +// Name: src/msw/wince/net.cpp +// Purpose: +// Author: +// Modified by: +// Created: +// RCS-ID: $Id$ +// Copyright: Copyright 1998, Ben Goetter. All rights reserved. +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// /* patch holes in winsock @@ -19,7 +28,10 @@ #pragma hdrstop #endif -#include "wx/msw/wrapwin.h" +#ifndef WX_PRECOMP + #include "wx/msw/wrapwin.h" +#endif + #include #include #include @@ -171,4 +183,3 @@ struct protoent * WINSOCKAPI getprotobynumber(int proto) ++pr; } return NULL; } - diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index f80b550c3a..27a5d7b313 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -31,6 +31,7 @@ #include "wx/toolbar.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/dynarray.h" #include "wx/frame.h" #include "wx/log.h" @@ -45,9 +46,6 @@ #include "malloc.h" #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - #include "wx/msw/private.h" #include #include diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp index b7e5715c8c..abea606670 100644 --- a/src/msw/wince/textctrlce.cpp +++ b/src/msw/wince/textctrlce.cpp @@ -29,11 +29,9 @@ #include "wx/textctrl.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - #include "wx/spinbutt.h" #include "wx/textfile.h" diff --git a/src/msw/window.cpp b/src/msw/window.cpp index b68d59085d..bd227b7ed3 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -28,6 +28,8 @@ #ifndef WX_PRECOMP #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/msw/missing.h" #include "wx/accel.h" #include "wx/menu.h" #include "wx/dc.h" @@ -103,15 +105,10 @@ #include #endif -// include "properly" -#include "wx/msw/wrapcctl.h" - #if !defined __WXWINCE__ && !defined NEED_PBT_H #include #endif -#include "wx/msw/missing.h" - #if defined(__WXWINCE__) #include "wx/msw/wince/missing.h" #ifdef __POCKETPC__ -- 2.45.2