Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.

[wxWidgets.git] / include / wx / generic / fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index f39d3c65741f1d72b1574498d639bc19838aa930..e1a81c3d1a4c8ff61f6fded10491ae3d93b9db20 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -18,6 +18,13 @@
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #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
  */
 /*
  * FONT DIALOG
  */


@@ -59,20 +66,32 @@ public:
 
     void OnChangeFont(wxCommandEvent& event);
 
 
     void OnChangeFont(wxCommandEvent& event);
 

+#if USE_SPINCTRL_FOR_POINT_SIZE
+    void OnChangeSize(wxSpinEvent& event);
+#endif
+

 protected:
 protected:

+
+    virtual bool DoCreate(wxWindow *parent);
+
+private:
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    virtual bool DoCreate(wxWindow *parent);
+    void DoChangeFont();
+
+    wxFont m_dialogFont;

 
 

-    wxFont dialogFont;
+    wxChoice *m_familyChoice;
+    wxChoice *m_styleChoice;
+    wxChoice *m_weightChoice;
+    wxChoice *m_colourChoice;
+    wxCheckBox *m_underLineCheckBox;

 
 

-    wxChoice *familyChoice;
-    wxChoice *styleChoice;
-    wxChoice *weightChoice;
-    wxChoice *colourChoice;
-    wxCheckBox *underLineCheckBox;
-    wxChoice   *pointSizeChoice;
+#if !USE_SPINCTRL_FOR_POINT_SIZE
+    wxChoice   *m_pointSizeChoice;
+#endif

 
     wxFontPreviewer *m_previewer;
     bool       m_useEvents;
 
     wxFontPreviewer *m_previewer;
     bool       m_useEvents;