Small tweaks for WinCE compatibility
Use generic folder dialog for WinCE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1dedb80b26
commit
529b7f71bd
@ -4,3 +4,6 @@ src/msw/wince/wxWindowsCE.vcw
|
||||
samples/minimal/minimalCE.vcp
|
||||
samples/minimal/minimalCE.vcw
|
||||
|
||||
samples/widgets/widgetsCE.vcp
|
||||
samples/widgets/widgetsCE.vcw
|
||||
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
*/
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
|
||||
#if defined(__WXWINCE__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
|
||||
#include "wx/generic/dirdlgg.h"
|
||||
#define wxDirDialog wxGenericDirDialog
|
||||
#else
|
||||
|
@ -75,7 +75,9 @@ protected:
|
||||
static void** AllocTable( size_t sz )
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
return (void **)malloc(sz * sizeof(void*));
|
||||
void** ptr = (void **)malloc(sz * sizeof(void*));
|
||||
memset( ptr, 0, sz * sizeof(void*));
|
||||
return ptr;
|
||||
#else
|
||||
return (void **)calloc(sz, sizeof(void*));
|
||||
#endif
|
||||
|
@ -251,8 +251,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
_T("Allow changing the year in the calendar"),
|
||||
TRUE);
|
||||
menuCal->AppendSeparator();
|
||||
menuCal->Append(Calendar_Cal_SetDate, "SetDate()", "Set date to 2005-12-24.");
|
||||
menuCal->Append(Calendar_Cal_Today, "Today()", "Set the current date.");
|
||||
menuCal->Append(Calendar_Cal_SetDate, _T("SetDate()"), _T("Set date to 2005-12-24."));
|
||||
menuCal->Append(Calendar_Cal_Today, _T("Today()"), _T("Set the current date."));
|
||||
|
||||
// now append the freshly created menu to the menu bar...
|
||||
wxMenuBar *menuBar = new wxMenuBar;
|
||||
|
@ -272,8 +272,7 @@ void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
long fontSize = wxGetNumberFromUser
|
||||
(
|
||||
_T("The font size also determines the caret size so\n"
|
||||
"this demonstrates resizing the caret."),
|
||||
_T("The font size also determines the caret size so\nthis demonstrates resizing the caret."),
|
||||
_T("Font size (in points):"),
|
||||
_T("wxCaret sample"),
|
||||
12, 1, 100,
|
||||
|
@ -25,6 +25,10 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
#include "wx/msw/wince/time.h"
|
||||
#endif
|
||||
|
||||
#include "wx/colordlg.h"
|
||||
#include "wx/filedlg.h"
|
||||
#include "wx/dirdlg.h"
|
||||
|
@ -250,8 +250,8 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
|
||||
wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
|
||||
while ( node )
|
||||
{
|
||||
wxWindow *win = node->GetData();
|
||||
if (SendIdleEvents(win, event))
|
||||
wxWindow *child = node->GetData();
|
||||
if (SendIdleEvents(child, event))
|
||||
needMore = TRUE;
|
||||
|
||||
node = node->GetNext();
|
||||
|
Loading…
Reference in New Issue
Block a user