applied patch 939076: __SMARTPHONE__ define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -42,7 +42,7 @@
|
|||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE
|
#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
|
||||||
|
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
#include "wx/colordlg.h"
|
#include "wx/colordlg.h"
|
||||||
|
@@ -28,7 +28,7 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_FILEDLG && !wxUSE_SMARTPHONE
|
#if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
// Only use this for MS SmartPhone. Use standard file dialog
|
// Only use this for MS SmartPhone. Use standard file dialog
|
||||||
// for Pocket PC.
|
// for Pocket PC.
|
||||||
|
|
||||||
#if wxUSE_FILEDLG && wxUSE_SMARTPHONE
|
#if wxUSE_FILEDLG && defined(__SMARTPHONE__)
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
@@ -256,7 +256,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
|
|||||||
memset (&mbi, 0, sizeof (SHMENUBARINFO));
|
memset (&mbi, 0, sizeof (SHMENUBARINFO));
|
||||||
mbi.cbSize = sizeof (SHMENUBARINFO);
|
mbi.cbSize = sizeof (SHMENUBARINFO);
|
||||||
mbi.hwndParent = (HWND) GetParent()->GetHWND();
|
mbi.hwndParent = (HWND) GetParent()->GetHWND();
|
||||||
#if defined(WIN32_PLATFORM_WFSP)
|
#ifdef __SMARTPHONE__
|
||||||
mbi.nToolBarId = 5002;
|
mbi.nToolBarId = 5002;
|
||||||
#else
|
#else
|
||||||
mbi.nToolBarId = 5000;
|
mbi.nToolBarId = 5000;
|
||||||
|
Reference in New Issue
Block a user