On WinCE, generic font dialog didn't work because the point size wxChoice
menu went off the display. Now a wxSpinCtrl is used. Also fixed the preview window in PDA mode (was invisible). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,6 +18,13 @@
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/cmndata.h"
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
#define USE_SPINCTRL_FOR_POINT_SIZE 1
|
||||
class WXDLLEXPORT wxSpinEvent;
|
||||
#else
|
||||
#define USE_SPINCTRL_FOR_POINT_SIZE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* FONT DIALOG
|
||||
*/
|
||||
@@ -59,6 +66,10 @@ public:
|
||||
|
||||
void OnChangeFont(wxCommandEvent& event);
|
||||
|
||||
#if USE_SPINCTRL_FOR_POINT_SIZE
|
||||
void OnChangeSize(wxSpinEvent& event);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
@@ -72,7 +83,10 @@ protected:
|
||||
wxChoice *weightChoice;
|
||||
wxChoice *colourChoice;
|
||||
wxCheckBox *underLineCheckBox;
|
||||
|
||||
#if !USE_SPINCTRL_FOR_POINT_SIZE
|
||||
wxChoice *pointSizeChoice;
|
||||
#endif
|
||||
|
||||
wxFontPreviewer *m_previewer;
|
||||
bool m_useEvents;
|
||||
|
Reference in New Issue
Block a user