Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/msw/wrap*.h according to pch support (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-09-07 19:01:45 +00:00
parent 8383c11698
commit 57bd4c6031
64 changed files with 185 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/wrapcctl.h
View File

@@ -34,6 +34,8 @@
#define _WIN32_IE 0x0600
#endif // !defined(_WIN32_IE)
#include "wx/msw/wrapwin.h"
#include <commctrl.h>
// define things which might be missing from our commctrl.h

7
src/common/appbase.cpp
View File

@@ -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 <signal.h> // 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

24
src/common/cmndata.cpp
View File

@@ -27,6 +27,9 @@
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#if defined(__WXMSW__)
#include "wx/msw/wrapcdlg.h"
#endif // MSW
#include <stdio.h>
#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)
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
#endif // wxUSE_PRINTING_ARCHITECTURE
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
// ============================================================================
// implementation

4
src/common/datetime.cpp
View File

@@ -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 <ctype.h>
#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#include <winnls.h>
#ifndef __WXWINCE__
#include <locale.h>

11
src/common/filename.cpp
View File

@@ -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__

7
src/common/imagbmp.cpp
View File

@@ -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
//-----------------------------------------------------------------------------

16
src/common/memory.cpp
View File

@@ -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 <stdarg.h>
#include <string.h>
#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

5
src/common/paper.cpp
View File

@@ -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 <string.h>
#ifdef __WXMSW__
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

4
src/common/prntbase.cpp
View File

@@ -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 <print.h>
#endif

11
src/common/stopwatch.cpp
View File

@@ -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

66
src/common/strconv.cpp
View File

@@ -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 )

7
src/generic/datavgen.cpp
View File

@@ -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
//-----------------------------------------------------------------------------

4
src/generic/filedlgg.cpp
View File

@@ -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

3
src/msw/app.cpp
View File

@@ -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 <string.h>
#include <ctype.h>
#include "wx/msw/wrapcctl.h"
// For MB_TASKMODAL
#ifdef __WXWINCE__
#include "wx/msw/wince/missing.h"

4
src/msw/checklst.cpp
View File

@@ -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 <windowsx.h>
#include "wx/msw/private.h"

2
src/msw/colordlg.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/colordlg.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcdlg.h"
#include <stdio.h>
#include "wx/colour.h"
#include "wx/gdicmn.h"
@@ -39,7 +40,6 @@
#endif
#include "wx/msw/private.h"
#include "wx/msw/wrapcdlg.h"
#include <stdlib.h>
#include <string.h>

4
src/msw/combobox.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/combobox.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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 <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif // wxUSE_TOOLTIPS

4
src/msw/control.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/control.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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 <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------

2
src/msw/cursor.cpp
View File

@@ -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__

4
src/msw/datectrl.cpp
View File

@@ -26,11 +26,11 @@
#if wxUSE_DATEPICKCTRL
#ifndef WX_PRECOMP
#include "wx/msw/wrapwin.h"
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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

2
src/msw/dc.cpp
View File

@@ -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 <string.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

2
src/msw/dcprint.cpp
View File

@@ -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 <print.h>
#endif

3
src/msw/dialog.cpp
View File

@@ -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__

5
src/msw/display.cpp
View File

@@ -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;

4
src/msw/dragimag.cpp
View File

@@ -27,6 +27,7 @@
#if wxUSE_DRAGIMAGE
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include <stdio.h>
#include "wx/window.h"
#include "wx/dcclient.h"
@@ -48,9 +49,6 @@
#include "wx/msw/wince/missing.h"
#endif // __WXWINCE__
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// Wine doesn't have this yet
#ifndef ListView_CreateDragImage
#define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \

5
src/msw/fdrepdlg.cpp
View File

@@ -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

6
src/msw/filedlg.cpp
View File

@@ -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 <stdlib.h>
#include <string.h>
#include "wx/filename.h"
#include "wx/tokenzr.h"
#include "wx/msw/missing.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------

3
src/msw/fontdlg.cpp
View File

@@ -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 <stdlib.h>
#include <string.h>

4
src/msw/frame.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/frame.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/utils.h"
@@ -43,9 +44,6 @@
#include "wx/msw/private.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
#include <ole2.h>
#include <aygshell.h>

4
src/msw/gauge95.cpp
View File

@@ -29,13 +29,11 @@
#include "wx/gauge.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#endif
#include "wx/msw/private.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------

4
src/msw/imaglist.cpp
View File

@@ -25,6 +25,7 @@
#endif
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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 <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------

21
src/msw/iniconf.cpp
View File

@@ -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
// ----------------------------------------------------------------------------

4
src/msw/listctrl.cpp
View File

@@ -27,6 +27,7 @@
#if wxUSE_LISTCTRL
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
@@ -48,9 +49,6 @@
#endif
#endif
// include <commctrl.h> "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.
//

4
src/msw/menu.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/menu.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/frame.h"
#include "wx/utils.h"
#include "wx/intl.h"
@@ -41,9 +42,6 @@
#include "wx/msw/private.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#ifdef __WXWINCE__
#include <windows.h>
#include <windowsx.h>

30
src/msw/notebook.cpp
View File

@@ -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 <commctrl.h> "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 <windowsx.h>
#include <windowsx.h>
#include "wx/msw/winundef.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#if wxUSE_UXTHEME
#include "wx/msw/uxtheme.h"
#endif

3
src/msw/ole/access.cpp
View File

@@ -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 <ole2.h>

4
src/msw/ole/droptgt.cpp
View File

@@ -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 <shlobj.h> // for DROPFILES structure
#endif
#else

4
src/msw/ole/uuid.cpp
View File

@@ -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 <rpc.h> // UUID related functions
#include "wx/msw/ole/uuid.h"

3
src/msw/printdlg.cpp
View File

@@ -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 <stdlib.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

2
src/msw/printwin.cpp
View File

@@ -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 <stdlib.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

11
src/msw/registry.cpp
View File

@@ -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 <winbase.h>

4
src/msw/settings.cpp
View File

@@ -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
// ----------------------------------------------------------------------------

4
src/msw/slider95.cpp
View File

@@ -30,14 +30,12 @@
#include "wx/slider.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/brush.h"
#endif
#include "wx/msw/subwin.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------

2
src/msw/spinbutt.cpp
View File

@@ -25,6 +25,7 @@
#endif
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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)

2
src/msw/spinctrl.cpp
View File

@@ -29,12 +29,12 @@
#include "wx/spinctrl.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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"

2
src/msw/statbox.cpp
View File

@@ -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

4
src/msw/statbr95.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/statusbr.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/frame.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
@@ -31,9 +32,6 @@
#include "wx/msw/private.h"
#include <windowsx.h>
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#if wxUSE_UXTHEME
#include "wx/msw/uxtheme.h"
#endif

9
src/msw/statline.cpp
View File

@@ -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

4
src/msw/tabctrl.cpp
View File

@@ -19,15 +19,13 @@
#if wxUSE_TAB_DIALOG
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/wx.h"
#include "wx/app.h"
#endif
#include "wx/msw/private.h"
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#include "wx/tabctrl.h"
#include "wx/msw/imaglist.h"

4
src/msw/tbar95.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/toolbar.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/dynarray.h"
#include "wx/frame.h"
#include "wx/log.h"
@@ -49,9 +50,6 @@
#include "wx/msw/uxtheme.h"
#endif
// include <commctrl.h> "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

3
src/msw/textctrl.cpp
View File

@@ -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 <richedit.h>
#endif
#include "wx/msw/missing.h"
#endif // wxUSE_RICHEDIT
// ----------------------------------------------------------------------------

2
src/msw/thread.cpp
View File

@@ -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"

6
src/msw/tooltip.cpp
View File

@@ -28,6 +28,7 @@
#include "wx/tooltip.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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 <commctrl.h> "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();
}

2
src/msw/toplevel.cpp
View File

@@ -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"

7
src/msw/treectrl.cpp
View File

@@ -29,6 +29,8 @@
#include "wx/treectrl.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "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 <commctrl.h> "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

2
src/msw/utils.cpp
View File

@@ -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 <windows.h>
#include "wx/msw/missing.h" // CHARSET_HANGUL
#if defined(__CYGWIN__)
//CYGWIN gives annoying warning about runtime stuff if we don't do this

2
src/msw/volume.cpp
View File

@@ -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 <shellapi.h>
#include <shlobj.h>
#include "wx/msw/missing.h"
#if wxUSE_BASE

4
src/msw/wince/checklst.cpp
View File

@@ -29,11 +29,9 @@
#include "wx/checklst.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#endif
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
// ============================================================================
// implementation
// ============================================================================

4
src/msw/wince/choicece.cpp
View File

@@ -29,11 +29,9 @@
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#endif
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#include "wx/spinbutt.h" // for wxSpinnerBestSize
#if wxUSE_EXTENDED_RTTI

13
src/msw/wince/helpwce.cpp
View File

@@ -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

17
src/msw/wince/net.cpp
View File

@@ -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 <tchar.h>
#include <winsock.h>
#include <string.h>
@@ -171,4 +183,3 @@ struct protoent * WINSOCKAPI getprotobynumber(int proto)
++pr;
} return NULL;
}

4
src/msw/wince/tbarwce.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/toolbar.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/dynarray.h"
#include "wx/frame.h"
#include "wx/log.h"
@@ -45,9 +46,6 @@
#include "malloc.h"
#endif
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#include "wx/msw/private.h"
#include <windows.h>
#include <windowsx.h>

4
src/msw/wince/textctrlce.cpp
View File

@@ -29,11 +29,9 @@
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#endif
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#include "wx/spinbutt.h"
#include "wx/textfile.h"

7
src/msw/window.cpp
View File

@@ -28,6 +28,8 @@
#ifndef WX_PRECOMP
#include "wx/msw/wrapwin.h"
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/msw/missing.h"
#include "wx/accel.h"
#include "wx/menu.h"
#include "wx/dc.h"
@@ -103,15 +105,10 @@
#include <windowsx.h>
#endif
// include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h"
#if !defined __WXWINCE__ && !defined NEED_PBT_H
#include <pbt.h>
#endif
#include "wx/msw/missing.h"
#if defined(__WXWINCE__)
#include "wx/msw/wince/missing.h"
#ifdef __POCKETPC__