many compilation fixes for WinCE using VC8 (it now build, although still doesn't work)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -49,15 +49,13 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
||||
// override base class virtuals
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
|
||||
// items may be checked
|
||||
virtual bool IsChecked(unsigned int uiIndex) const;
|
||||
virtual void Check(unsigned int uiIndex, bool bCheck = true);
|
||||
|
||||
// public interface derived from wxListBox and lower classes
|
||||
virtual void Clear();
|
||||
virtual void DoClear();
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual int GetSelection() const;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
|
@@ -12,12 +12,15 @@
|
||||
#ifndef _WX_MSW_WINCE_CHKCONF_H_
|
||||
#define _WX_MSW_WINCE_CHKCONF_H_
|
||||
|
||||
// Standard SDK lacks a few things, forcefully disable them
|
||||
#ifdef WCE_PLATFORM_STANDARDSDK
|
||||
// no shell functions support
|
||||
#undef wxUSE_STDPATHS
|
||||
#define wxUSE_STDPATHS 0
|
||||
#endif // WCE_PLATFORM_STANDARDSDK
|
||||
// ----------------------------------------------------------------------------
|
||||
// Disable features which don't work or don't make sense under CE
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// please keep the list in alphabetic order except for closely related settings
|
||||
// (e.g. wxUSE_ENH_METAFILE is put immediately after wxUSE_METAFILE)
|
||||
|
||||
#undef wxUSE_DEBUGREPORT
|
||||
#define wxUSE_DEBUGREPORT 0
|
||||
|
||||
#if _WIN32_WCE < 400
|
||||
// not enough API and lack of ddraw.h
|
||||
@@ -25,48 +28,86 @@
|
||||
#define wxUSE_DISPLAY 0
|
||||
#endif
|
||||
|
||||
// wxFSVolume currently doesn't compile under CE and it's not clear if it makes
|
||||
// sense at all there (the drives and their names are fixed on CE systems)
|
||||
#undef wxUSE_FSVOLUME
|
||||
#define wxUSE_FSVOLUME 0
|
||||
|
||||
// no .INI files API under CE
|
||||
#undef wxUSE_INICONF
|
||||
#define wxUSE_INICONF 0
|
||||
|
||||
// DDE doesn't exist under WinCE and wxIPC is DDE-based under MSW
|
||||
#undef wxUSE_IPC
|
||||
#define wxUSE_IPC 0
|
||||
|
||||
// metafiles are not supported neither
|
||||
#undef wxUSE_ENH_METAFILE
|
||||
#define wxUSE_ENH_METAFILE 0
|
||||
|
||||
#undef wxUSE_METAFILE
|
||||
#define wxUSE_METAFILE 0
|
||||
|
||||
// eVC doesn't support SEH
|
||||
#undef wxUSE_ON_FATAL_EXCEPTION
|
||||
#define wxUSE_ON_FATAL_EXCEPTION 0
|
||||
|
||||
#undef wxUSE_WXHTML_HELP
|
||||
#define wxUSE_WXHTML_HELP 0
|
||||
|
||||
// libtiff and regex apparently don't compile with eVC (to check with eVC4?)
|
||||
// and they're disabled for WinCE in build/bakefiles/{tiff|regex}.bkl so can't
|
||||
// be enabled here
|
||||
#undef wxUSE_LIBTIFF
|
||||
#define wxUSE_LIBTIFF 0
|
||||
|
||||
// no MDI under CE
|
||||
#undef wxUSE_MDI
|
||||
#define wxUSE_MDI 0
|
||||
#undef wxUSE_MDI_ARCHITECTURE
|
||||
#define wxUSE_MDI_ARCHITECTURE 0
|
||||
|
||||
// metafiles are not supported neither
|
||||
#undef wxUSE_METAFILE
|
||||
#define wxUSE_METAFILE 0
|
||||
#undef wxUSE_ENH_METAFILE
|
||||
#define wxUSE_ENH_METAFILE 0
|
||||
|
||||
// not sure if this is supported by CE but it doesn't compile currently anyhow
|
||||
#undef wxUSE_MS_HTML_HELP
|
||||
#define wxUSE_MS_HTML_HELP 0
|
||||
|
||||
// eVC doesn't support SEH
|
||||
#undef wxUSE_ON_FATAL_EXCEPTION
|
||||
#define wxUSE_ON_FATAL_EXCEPTION 0
|
||||
|
||||
// no owner drawn controls (not sure if this is possible at all but in any case
|
||||
// the code doesn't currently compile)
|
||||
#undef wxUSE_OWNER_DRAWN
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
|
||||
// libtiff and regex apparently don't compile with eVC (to check with eVC4?)
|
||||
// other MSW settings not supported by CE
|
||||
#undef wxUSE_PRINTING_ARCHITECTURE
|
||||
#define wxUSE_PRINTING_ARCHITECTURE 0
|
||||
|
||||
#undef wxUSE_REGEX
|
||||
#define wxUSE_REGEX 0
|
||||
|
||||
#undef wxUSE_DEBUGREPORT
|
||||
#define wxUSE_DEBUGREPORT 0
|
||||
|
||||
// other MSW settings not supported by CE
|
||||
#undef wxUSE_RICHEDIT
|
||||
#define wxUSE_RICHEDIT 0
|
||||
#undef wxUSE_RICHEDIT2
|
||||
#define wxUSE_RICHEDIT2 0
|
||||
|
||||
#undef wxUSE_UXTHEME
|
||||
#define wxUSE_UXTHEME 0
|
||||
// Standard SDK lacks a few things, forcefully disable them
|
||||
#ifdef WCE_PLATFORM_STANDARDSDK
|
||||
// no shell functions support
|
||||
#undef wxUSE_STDPATHS
|
||||
#define wxUSE_STDPATHS 0
|
||||
#endif // WCE_PLATFORM_STANDARDSDK
|
||||
|
||||
// not sure if this is supported by eVC but VC8 SDK lacks the tooltips control
|
||||
// related declarations
|
||||
#if defined(__VISUALC__) && __VISUALC__ >= 1400
|
||||
#undef wxUSE_TOOLTIPS
|
||||
#define wxUSE_TOOLTIPS 0
|
||||
#endif
|
||||
|
||||
#undef wxUSE_UNICODE_MSLU
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
|
||||
#undef wxUSE_UXTHEME
|
||||
#define wxUSE_UXTHEME 0
|
||||
|
||||
#undef wxUSE_WXHTML_HELP
|
||||
#define wxUSE_WXHTML_HELP 0
|
||||
|
||||
|
||||
// Disable features which don't make sense for MS Smartphones
|
||||
// (due to pointer device usage, limited controls or dialogs, file system)
|
||||
#if defined(__SMARTPHONE__)
|
||||
|
@@ -149,7 +149,8 @@ protected:
|
||||
wxObject *clientData,
|
||||
const wxString& shortHelp,
|
||||
const wxString& longHelp);
|
||||
virtual wxToolBarToolBase *CreateTool(wxControl *control);
|
||||
virtual wxToolBarToolBase *CreateTool(wxControl *control,
|
||||
const wxString& label);
|
||||
|
||||
// The menubar associated with this toolbar
|
||||
wxMenuBar* m_menuBar;
|
||||
|
Reference in New Issue
Block a user