added wx{Colour|File|Dir|Font}PickerCtrl (patch 1472329 by Francesco)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 23:57:54 +00:00
parent 96aed0cd6b
commit ec376c8fd9
70 changed files with 6911 additions and 1 deletions
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -52,8 +52,10 @@ WIDGETS_OBJECTS =  \
 	widgets_combobox.o \
 	widgets_datepick.o \
 	widgets_gauge.o \
+	widgets_hyperlnk.o \
 	widgets_listbox.o \
 	widgets_notebook.o \
+	widgets_picker.o \
 	widgets_radiobox.o \
 	widgets_slider.o \
 	widgets_spinbtn.o \
@@ -215,12 +217,18 @@ widgets_datepick.o: $(srcdir)/datepick.cpp
 widgets_gauge.o: $(srcdir)/gauge.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/gauge.cpp

+widgets_hyperlnk.o: $(srcdir)/hyperlnk.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/hyperlnk.cpp
+
 widgets_listbox.o: $(srcdir)/listbox.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/listbox.cpp

 widgets_notebook.o: $(srcdir)/notebook.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/notebook.cpp

+widgets_picker.o: $(srcdir)/picker.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/picker.cpp
+
 widgets_radiobox.o: $(srcdir)/radiobox.cpp
 	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/radiobox.cpp

--- a/samples/widgets/icons/picker.xpm
+++ b/samples/widgets/icons/picker.xpm
@@ -0,0 +1,183 @@
+/* XPM */
+static char *picker_xpm[]={
+"32 32 148 2",
+"Qt c None",
+".P c #00a900",
+".q c #00aa01",
+".y c #00ab01",
+".r c #00ac01",
+".G c #00ad01",
+".j c #018700",
+".C c #018901",
+".L c #018d00",
+".Q c #01a901",
+".D c #029902",
+".O c #029b02",
+".F c #03ab03",
+".Y c #059a05",
+".u c #067706",
+".Z c #069905",
+".E c #06ab06",
+".W c #0d7e09",
+"#s c #0d8109",
+".T c #0f750e",
+".3 c #117611",
+"#b c #167616",
+".z c #16b116",
+".0 c #179716",
+".b c #198219",
+".9 c #1a7a16",
+".A c #1a7a19",
+".V c #1a8719",
+"#j c #1f821a",
+"#l c #217d1f",
+".f c #218b20",
+".x c #22b422",
+"#t c #267c23",
+".c c #278427",
+".s c #288428",
+".7 c #2a8e29",
+"#B c #2b712a",
+".m c #319231",
+"#. c #31a130",
+".M c #32bc32",
+".X c #349632",
+".H c #37bb37",
+"#h c #389635",
+".p c #3ebd3e",
+".8 c #3f923c",
+".I c #40ab40",
+".i c #52c152",
+".R c #52c353",
+".v c #5cc15c",
+"#A c #5e795f",
+".a c #5fa25f",
+".6 c #639064",
+"#u c #659a65",
+".B c #68a868",
+"an c #69696a",
+".w c #6bcb6c",
+"af c #6e6e6f",
+"#9 c #6e6e70",
+"#5 c #6f6f70",
+".K c #70ab70",
+"#0 c #717172",
+"#W c #727273",
+"aq c #737373",
+"#S c #737374",
+"#G c #747475",
+"## c #75bc74",
+".J c #77a876",
+"ao c #797979",
+".S c #7ece7e",
+".1 c #7fd27f",
+".k c #80b080",
+"ag c #818181",
+"ak c #838384",
+"aa c #878788",
+".d c #8ab88a",
+"#r c #8dbc8d",
+"#2 c #8e8e90",
+"#O c #8f8f90",
+"#J c #909091",
+"#D c #909092",
+"#e c #919192",
+".t c #92bd92",
+"al c #939395",
+".N c #93d893",
+"#C c #95b795",
+"#6 c #989899",
+"#m c #9abc9a",
+"#a c #9ecb9e",
+".e c #a5c8a5",
+".2 c #a5daa5",
+".o c #a9e0a9",
+"#k c #aad4a9",
+".g c #abddab",
+"#i c #accaab",
+"#H c #afafaf",
+"#M c #b0b0b0",
+"am c #b0b0b2",
+"a. c #b1b1b1",
+".n c #b4e3b4",
+".l c #b7d1b7",
+"aj c #bababc",
+"#g c #bbc9bc",
+"#d c #bcbcbc",
+"#v c #bdbdbd",
+".5 c #bebebe",
+"#I c #bfbfbf",
+".4 c #bfd2bf",
+"#N c #c0c0c0",
+"ai c #c0c0c3",
+"#T c #c1c1c1",
+"ah c #c5c5c8",
+"ar c #c8c8c8",
+"ac c #c8c8cb",
+"#c c #c8d8c8",
+"a# c #cbcbcb",
+".# c #cbdccb",
+"#1 c #cccccc",
+"ae c #cececf",
+"#8 c #cfcfd1",
+"#4 c #d0d0d2",
+"#f c #d0d0d3",
+"#Z c #d1d1d2",
+"#n c #d1d1d3",
+"#V c #d2d2d3",
+"#w c #d2d2d4",
+"#K c #d3d3d4",
+"#p c #d3d3d5",
+"#P c #d3d3d6",
+"#F c #d4d4d5",
+"#z c #d4d4d6",
+"#X c #d4d4d7",
+"#3 c #d5d5d8",
+"#U c #d8d8da",
+"#Q c #d9d9db",
+"#E c #d9d9dc",
+"ap c #dadada",
+"ad c #dadadb",
+"#x c #dadadc",
+"#q c #dadeda",
+"#o c #dbdbdd",
+"ab c #dddddf",
+".h c #ddf3dd",
+"#y c #e2e2e3",
+"#L c #e3e3e3",
+"#R c #e3e3e4",
+".U c #e3e8e3",
+"#Y c #e4e4e4",
+"#7 c #e5e5e5",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.dQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.e.f.g.h.i.j.kQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.l.m.n.o.p.q.r.sQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.t.u.v.w.x.y.r.z.AQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.B.C.D.E.F.G.y.H.I.JQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.K.L.M.N.O.P.Q.R.S.T.UQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.V.W.X.Y.Z.0.1.2.3.4QtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.5.6.7.8.9#.###a#b#cQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQt#d#e#f#g#h#i#j#k#l#mQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQt#d#e#n#o#p#q#r#s#t#uQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQt#v#e#w#x#p#y#z#A#B#CQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQt.5#D#w#E#p#y#F#G#HQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQt#I#J#p#E#K#L#K#G#MQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQt#N#O#P#Q#K#R#K#S#MQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQt#T#e#P#U#K#R#V#W#MQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQt#T#e#X#U#K#Y#Z#0#MQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQt#1#2#3#U#V#Y#4#5#MQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQt#6#X#n#K#7#8#9a.QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQta#aaabacadaeaf#HQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtagahacaiajaf#HQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtakalamanaoapQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQt#v#5aqarQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -42,6 +42,7 @@ WIDGETS_OBJECTS =  \
 	$(OBJS)\widgets_hyperlnk.obj \
 	$(OBJS)\widgets_listbox.obj \
 	$(OBJS)\widgets_notebook.obj \
+	$(OBJS)\widgets_picker.obj \
 	$(OBJS)\widgets_radiobox.obj \
 	$(OBJS)\widgets_slider.obj \
 	$(OBJS)\widgets_spinbtn.obj \
@@ -263,6 +264,9 @@ $(OBJS)\widgets_listbox.obj: .\listbox.cpp
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
 	$(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

+$(OBJS)\widgets_picker.obj: .\picker.cpp
+	$(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
 	$(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -35,6 +35,7 @@ WIDGETS_OBJECTS =  \
 	$(OBJS)\widgets_hyperlnk.o \
 	$(OBJS)\widgets_listbox.o \
 	$(OBJS)\widgets_notebook.o \
+	$(OBJS)\widgets_picker.o \
 	$(OBJS)\widgets_radiobox.o \
 	$(OBJS)\widgets_slider.o \
 	$(OBJS)\widgets_spinbtn.o \
@@ -256,6 +257,9 @@ $(OBJS)\widgets_listbox.o: ./listbox.cpp
 $(OBJS)\widgets_notebook.o: ./notebook.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\widgets_picker.o: ./picker.cpp
+	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\widgets_radiobox.o: ./radiobox.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<

--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -35,6 +35,7 @@ WIDGETS_OBJECTS =  \
 	$(OBJS)\widgets_hyperlnk.obj \
 	$(OBJS)\widgets_listbox.obj \
 	$(OBJS)\widgets_notebook.obj \
+	$(OBJS)\widgets_picker.obj \
 	$(OBJS)\widgets_radiobox.obj \
 	$(OBJS)\widgets_slider.obj \
 	$(OBJS)\widgets_spinbtn.obj \
@@ -338,6 +339,9 @@ $(OBJS)\widgets_listbox.obj: .\listbox.cpp
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**

+$(OBJS)\widgets_picker.obj: .\picker.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**

--- a/samples/widgets/makefile.wat
+++ b/samples/widgets/makefile.wat
@@ -232,6 +232,7 @@ WIDGETS_OBJECTS =  &
 	$(OBJS)\widgets_hyperlnk.obj &
 	$(OBJS)\widgets_listbox.obj &
 	$(OBJS)\widgets_notebook.obj &
+	$(OBJS)\widgets_picker.obj &
 	$(OBJS)\widgets_radiobox.obj &
 	$(OBJS)\widgets_slider.obj &
 	$(OBJS)\widgets_spinbtn.obj &
@@ -293,6 +294,9 @@ $(OBJS)\widgets_listbox.obj :  .AUTODEPEND .\listbox.cpp
 $(OBJS)\widgets_notebook.obj :  .AUTODEPEND .\notebook.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

+$(OBJS)\widgets_picker.obj :  .AUTODEPEND .\picker.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
 $(OBJS)\widgets_radiobox.obj :  .AUTODEPEND .\radiobox.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<

--- a/samples/widgets/picker.cpp
+++ b/samples/widgets/picker.cpp
@@ -0,0 +1,577 @@
+/////////////////////////////////////////////////////////////////////////////
+// Program:     wxWidgets Widgets Sample
+// Name:        picker.cpp
+// Purpose:     Part of the widgets sample showing wx*PickerCtrl
+// Author:      Francesco Montorsi
+// Created:     22/4/2006
+// Id:          $Id$
+// Copyright:   (c) 2006 Francesco Montorsi
+// License:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_COLOURPICKERCTRL || wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL || wxUSE_FONTPICKERCTRL
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/artprov.h"
+#include "wx/sizer.h"
+#include "wx/stattext.h"
+#include "wx/checkbox.h"
+#include "wx/imaglist.h"
+
+#include "wx/clrpicker.h"
+#include "wx/filepicker.h"
+#include "wx/fontpicker.h"
+
+#include "widgets.h"
+
+#include "icons/picker.xpm"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// control ids
+enum
+{
+    PickerPage_Reset = wxID_HIGHEST,
+
+#if wxUSE_COLOURPICKERCTRL
+    PickerPage_Colour,
+#endif
+#if wxUSE_FILEPICKERCTRL
+    PickerPage_File,
+#endif
+#if wxUSE_DIRPICKERCTRL
+    PickerPage_Dir,
+#endif
+#if wxUSE_FONTPICKERCTRL
+    PickerPage_Font
+#endif
+};
+
+
+// ----------------------------------------------------------------------------
+// PickerWidgetsPage
+// ----------------------------------------------------------------------------
+
+class PickerWidgetsPage : public WidgetsPage
+{
+public:
+    PickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+    virtual ~PickerWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { /*return m_fontPicker;*/ return NULL; }
+    virtual void RecreateWidget() { RecreateAllPickers(); }
+
+protected:
+    enum PickerKind
+    {
+        Picker_None = -1,
+        Picker_Colour,
+        Picker_File,
+        Picker_Dir,
+        Picker_Font
+    };
+
+    // called only once at first construction
+    void CreatePickers(PickerKind picker);
+
+    // called to recreate an existing control
+    void RecreatePicker(PickerKind picker);
+
+    // recreate all existing picker controls
+    void RecreateAllPickers();
+
+    // restore the checkboxes state to the initial values
+    void Reset();
+
+    // get the initial style for the picker of the given kind
+    long GetPickerStyle(PickerKind kind);
+
+
+    // the pickers and the relative event handlers
+#if wxUSE_COLOURPICKERCTRL
+    wxColourPickerCtrl *m_clrPicker;
+    void OnColourChange(wxColourPickerEvent &ev);
+#endif
+#if wxUSE_FILEPICKERCTRL
+    wxFilePickerCtrl *m_filePicker;
+    void OnFileChange(wxFileDirPickerEvent &ev);
+#endif
+#if wxUSE_DIRPICKERCTRL
+    wxDirPickerCtrl *m_dirPicker;
+    void OnDirChange(wxFileDirPickerEvent &ev);
+#endif
+#if wxUSE_FONTPICKERCTRL
+    wxFontPickerCtrl *m_fontPicker;
+    void OnFontChange(wxFontPickerEvent &ev);
+#endif
+    void OnCheckBox(wxCommandEvent &ev);
+    void OnButtonReset(wxCommandEvent &ev);
+
+
+    // other controls
+    // --------------
+
+    wxCheckBox *m_chkColourTextCtrl,
+               *m_chkColourShowLabel;
+
+    wxCheckBox *m_chkFileTextCtrl,
+               *m_chkFileOverwritePrompt,
+               *m_chkFileMustExist,
+               *m_chkFileChangeDir;
+
+    wxCheckBox *m_chkDirTextCtrl,
+               *m_chkDirChangeDir,
+               *m_chkDirMustExist;
+
+    wxCheckBox *m_chkFontTextCtrl,
+               *m_chkFontDescAsLabel,
+               *m_chkFontUseFontForLabel;
+
+    wxFlexGridSizer *m_sizerPicker;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_WIDGETS_PAGE(PickerWidgetsPage)
+};
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(PickerWidgetsPage, WidgetsPage)
+    EVT_BUTTON(PickerPage_Reset, PickerWidgetsPage::OnButtonReset)
+
+#if wxUSE_COLOURPICKERCTRL
+    EVT_COLOURPICKER_CHANGED(PickerPage_Colour, PickerWidgetsPage::OnColourChange)
+#endif
+#if wxUSE_FILEPICKERCTRL
+    EVT_FILEPICKER_CHANGED(PickerPage_File, PickerWidgetsPage::OnFileChange)
+#endif
+#if wxUSE_DIRPICKERCTRL
+    EVT_DIRPICKER_CHANGED(PickerPage_Dir, PickerWidgetsPage::OnDirChange)
+#endif
+#if wxUSE_FONTPICKERCTRL
+    EVT_FONTPICKER_CHANGED(PickerPage_Font, PickerWidgetsPage::OnFontChange)
+#endif
+
+    EVT_CHECKBOX(wxID_ANY, PickerWidgetsPage::OnCheckBox)
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_WIDGETS_PAGE(PickerWidgetsPage, _T("Pickers"), PICKER_CTRLS);
+
+PickerWidgetsPage::PickerWidgetsPage(WidgetsBookCtrl *book,
+                                     wxImageList *imaglist)
+                  : WidgetsPage(book, imaglist, picker_xpm)
+{
+    imaglist->Add(wxBitmap(picker_xpm));
+
+    // left pane
+    wxSizer *boxleft = new wxBoxSizer(wxVERTICAL);
+
+#if wxUSE_COLOURPICKERCTRL
+    wxStaticBoxSizer *clrbox = new wxStaticBoxSizer(wxVERTICAL, this, _T("&ColourPicker style"));
+    m_chkColourTextCtrl = CreateCheckBoxAndAddToSizer(clrbox, _T("With textctrl"), false);
+    m_chkColourShowLabel = CreateCheckBoxAndAddToSizer(clrbox, _T("With label"), false);
+    boxleft->Add(clrbox, 0, wxALL|wxGROW, 5);
+    boxleft->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+    wxStaticBoxSizer *filebox = new wxStaticBoxSizer(wxVERTICAL, this, _T("&FilePicker style"));
+    m_chkFileTextCtrl = CreateCheckBoxAndAddToSizer(filebox, _T("With textctrl"), false);
+    m_chkFileOverwritePrompt = CreateCheckBoxAndAddToSizer(filebox, _T("Overwrite prompt"), false);
+    m_chkFileMustExist = CreateCheckBoxAndAddToSizer(filebox, _T("File must exist"), false);
+    m_chkFileChangeDir = CreateCheckBoxAndAddToSizer(filebox, _T("Change working dir"), false);
+    boxleft->Add(filebox, 0, wxALL|wxGROW, 5);
+    boxleft->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+    wxStaticBoxSizer *dirbox = new wxStaticBoxSizer(wxVERTICAL, this, _T("&DirPicker style"));
+    m_chkDirTextCtrl = CreateCheckBoxAndAddToSizer(dirbox, _T("With textctrl"), false);
+    m_chkDirMustExist = CreateCheckBoxAndAddToSizer(dirbox, _T("Dir must exist"), false);
+    m_chkDirChangeDir = CreateCheckBoxAndAddToSizer(dirbox, _T("Change working dir"), false);
+    boxleft->Add(dirbox, 0, wxALL|wxGROW, 5);
+    boxleft->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+    wxStaticBoxSizer *fontbox = new wxStaticBoxSizer(wxVERTICAL, this, _T("&FontPicker style"));
+    m_chkFontTextCtrl = CreateCheckBoxAndAddToSizer(fontbox, _T("With textctrl"));
+    m_chkFontDescAsLabel = CreateCheckBoxAndAddToSizer(fontbox, _T("Font desc as btn label"));
+    m_chkFontUseFontForLabel = CreateCheckBoxAndAddToSizer(fontbox, _T("Use font for label"), false);
+    boxleft->Add(fontbox, 0, wxALL|wxGROW, 5);
+#endif // wxUSE_FONTPICKERCTRL
+
+    boxleft->Add(new wxButton(this, PickerPage_Reset, _T("&Reset")),
+                 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
+
+    Reset();    // set checkboxes state
+
+    // create pickers
+    m_clrPicker = NULL;
+    m_filePicker = NULL;
+    m_fontPicker = NULL;
+    m_dirPicker = NULL;
+
+    int nrows = 0;
+#if wxUSE_COLOURPICKERCTRL
+    CreatePickers(Picker_Colour);
+    nrows++;
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+    CreatePickers(Picker_File);
+    nrows++;
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+    CreatePickers(Picker_Dir);
+    nrows++;
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+    CreatePickers(Picker_Font);
+    nrows++;
+#endif // wxUSE_FONTPICKERCTRL
+
+    m_sizerPicker = new wxFlexGridSizer(nrows, 2, 0, 0);  // 4 rows x 2 columns
+#if wxUSE_COLOURPICKERCTRL
+    m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxColourPickerCtrl:")),
+                       0, wxALIGN_CENTER | wxALL, 5);
+    m_sizerPicker->Add(m_clrPicker, 1, wxGROW | wxALL, 5);
+#endif
+#if wxUSE_FILEPICKERCTRL
+    m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFilePickerCtrl:")),
+                       0, wxALIGN_CENTER | wxALL, 5);
+    m_sizerPicker->Add(m_filePicker, 1, wxGROW | wxALL, 5);
+#endif
+#if wxUSE_DIRPICKERCTRL
+    m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxDirPickerCtrl:")),
+                       0, wxALIGN_CENTER | wxALL, 5);
+    m_sizerPicker->Add(m_dirPicker, 1, wxGROW | wxALL, 5);
+#endif
+#if wxUSE_FONTPICKERCTRL
+    m_sizerPicker->Add(new wxStaticText(this, wxID_ANY, wxT("wxFontPickerCtrl:")),
+                       0, wxALIGN_CENTER | wxALL, 5);
+    m_sizerPicker->Add(m_fontPicker, 1, wxGROW | wxALL, 5);
+#endif
+
+    m_sizerPicker->AddGrowableCol(1, 3);
+
+    // right pane
+    wxStaticBoxSizer *
+        boxright = new wxStaticBoxSizer(wxVERTICAL, this, _T("Pickers"));
+    boxright->Add(m_sizerPicker, 1, wxGROW | wxALL, 5);
+
+    // global pane
+    wxSizer *sz = new wxBoxSizer(wxHORIZONTAL);
+    sz->Add(boxleft, 0, wxGROW|wxALL, 5);
+    sz->Add(boxright, 1, wxGROW|wxALL, 5);
+
+    SetSizerAndFit(sz);
+}
+
+void PickerWidgetsPage::CreatePickers(PickerKind picker)
+{
+    switch ( picker )
+    {
+#if wxUSE_COLOURPICKERCTRL
+        case Picker_Colour:
+            delete m_clrPicker;
+
+            m_clrPicker = new wxColourPickerCtrl(this, PickerPage_Colour, *wxRED,
+                                                 wxDefaultPosition, wxDefaultSize,
+                                                 GetPickerStyle(Picker_Colour));
+            break;
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+        case Picker_File:
+            delete m_filePicker;
+
+            // pass an empty string as initial file
+            m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,
+                                                wxEmptyString,
+                                                wxT("Hello!"), wxT("*"),
+                                                wxDefaultPosition, wxDefaultSize,
+                                                GetPickerStyle(Picker_File));
+            break;
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+        case Picker_Dir:
+            delete m_dirPicker;
+
+            m_dirPicker = new wxDirPickerCtrl(this, PickerPage_Dir,
+                                              wxGetHomeDir(), wxT("Hello!"),
+                                              wxDefaultPosition, wxDefaultSize,
+                                              GetPickerStyle(Picker_Dir));
+            break;
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+        case Picker_Font:
+            delete m_fontPicker;
+
+            m_fontPicker = new wxFontPickerCtrl(this, PickerPage_Font,
+                                                *wxSWISS_FONT,
+                                                wxDefaultPosition, wxDefaultSize,
+                                                GetPickerStyle(Picker_Font));
+            break;
+#endif // wxUSE_FONTPICKERCTRL
+
+        default:
+            wxFAIL_MSG( _T("unknown picker kind") );
+    }
+}
+
+long PickerWidgetsPage::GetPickerStyle(PickerKind picker)
+{
+    long style = 0;
+
+    switch (picker)
+    {
+#if wxUSE_COLOURPICKERCTRL
+        case Picker_Colour:
+            if ( m_chkColourTextCtrl->GetValue() )
+                style |= wxCLRP_USE_TEXTCTRL;
+
+            if ( m_chkColourShowLabel->GetValue() )
+                style |= wxCLRP_SHOW_LABEL;
+
+            break;
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+        case Picker_File:
+            if ( m_chkFileTextCtrl->GetValue() )
+                style |= wxFLP_USE_TEXTCTRL;
+
+            if ( m_chkFileOverwritePrompt->GetValue() )
+                style |= wxFLP_OVERWRITE_PROMPT;
+
+            if ( m_chkFileMustExist->GetValue() )
+                style |= wxFLP_FILE_MUST_EXIST;
+
+            if ( m_chkFileChangeDir->GetValue() )
+                style |= wxFLP_CHANGE_DIR;
+
+            break;
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+        case Picker_Dir:
+            if ( m_chkDirTextCtrl->GetValue() )
+                style |= wxDIRP_USE_TEXTCTRL;
+
+            if ( m_chkDirMustExist->GetValue() )
+                style |= wxDIRP_DIR_MUST_EXIST;
+
+            if ( m_chkDirChangeDir->GetValue() )
+                style |= wxDIRP_CHANGE_DIR;
+
+            break;
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+        case Picker_Font:
+            if ( m_chkFontTextCtrl->GetValue() )
+                style |= wxFNTP_USE_TEXTCTRL;
+
+            if ( m_chkFontUseFontForLabel->GetValue() )
+                style |= wxFNTP_USEFONT_FOR_LABEL;
+
+            if ( m_chkFontDescAsLabel->GetValue() )
+                 style |= wxFNTP_FONTDESC_AS_LABEL;
+
+            break;
+#endif // wxUSE_FONTPICKERCTRL
+
+        default:
+            wxFAIL_MSG( _T("unknown picker kind") );
+    }
+
+    return style;
+}
+
+void PickerWidgetsPage::RecreatePicker(PickerKind picker)
+{
+    switch ( picker )
+    {
+#if wxUSE_COLOURPICKERCTRL
+        case Picker_Colour:
+            m_sizerPicker->Remove(1);
+            CreatePickers(Picker_Colour);
+            m_sizerPicker->Insert(1, m_clrPicker, 1, wxGROW|wxALL, 5);
+            break;
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+        case Picker_File:
+            m_sizerPicker->Remove(3);
+            CreatePickers(Picker_File);
+            m_sizerPicker->Insert(3, m_filePicker, 1, wxGROW|wxALL, 5);
+            break;
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+        case Picker_Dir:
+            m_sizerPicker->Remove(5);
+            CreatePickers(Picker_Dir);
+            m_sizerPicker->Insert(5, m_dirPicker, 1, wxGROW|wxALL, 5);
+            break;
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+        case Picker_Font:
+            wxASSERT(m_sizerPicker->Remove(7));
+            CreatePickers(Picker_Font);
+            m_sizerPicker->Insert(7, m_fontPicker, 1, wxGROW|wxALL, 5);
+            break;
+#endif // wxUSE_FONTPICKERCTRL
+
+        default:
+            wxFAIL_MSG( _T("unknown picker kind") );
+    }
+
+    m_sizerPicker->Layout();
+}
+
+void PickerWidgetsPage::RecreateAllPickers()
+{
+#if wxUSE_COLOURPICKERCTRL
+    RecreatePicker(Picker_Colour);
+#endif // wxUSE_COLOURPICKERCTRL
+
+#if wxUSE_FILEPICKERCTRL
+    RecreatePicker(Picker_File);
+#endif // wxUSE_FILEPICKERCTRL
+
+#if wxUSE_DIRPICKERCTRL
+    RecreatePicker(Picker_Dir);
+#endif // wxUSE_DIRPICKERCTRL
+
+#if wxUSE_FONTPICKERCTRL
+    RecreatePicker(Picker_Font);
+#endif // wxUSE_FONTPICKERCTRL
+}
+
+void PickerWidgetsPage::Reset()
+{
+#if wxUSE_COLOURPICKERCTRL
+    m_chkColourTextCtrl->SetValue((wxCLRP_DEFAULT_STYLE & wxCLRP_USE_TEXTCTRL) != 0);
+    m_chkColourShowLabel->SetValue((wxCLRP_DEFAULT_STYLE & wxCLRP_SHOW_LABEL) != 0);
+#endif
+
+#if wxUSE_FILEPICKERCTRL
+    m_chkFileTextCtrl->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_USE_TEXTCTRL) != 0);
+    m_chkFileOverwritePrompt->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_OVERWRITE_PROMPT) != 0);
+    m_chkFileMustExist->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_FILE_MUST_EXIST) != 0);
+    m_chkFileChangeDir->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_CHANGE_DIR) != 0);
+#endif
+
+#if wxUSE_DIRPICKERCTRL
+    m_chkDirTextCtrl->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_USE_TEXTCTRL) != 0);
+    m_chkDirMustExist->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_DIR_MUST_EXIST) != 0);
+    m_chkDirChangeDir->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_CHANGE_DIR) != 0);
+#endif
+
+#if wxUSE_FONTPICKERCTRL
+    m_chkFontTextCtrl->SetValue((wxFNTP_DEFAULT_STYLE & wxFNTP_USE_TEXTCTRL) != 0);
+    m_chkFontUseFontForLabel->SetValue((wxFNTP_DEFAULT_STYLE & wxFNTP_USEFONT_FOR_LABEL) != 0);
+    m_chkFontDescAsLabel->SetValue((wxFNTP_DEFAULT_STYLE & wxFNTP_FONTDESC_AS_LABEL) != 0);
+#endif
+}
+
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+void PickerWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
+{
+    Reset();
+
+    RecreateAllPickers();
+}
+
+#if wxUSE_COLOURPICKERCTRL
+void PickerWidgetsPage::OnColourChange(wxColourPickerEvent& event)
+{
+    wxLogMessage(wxT("The colour changed to '%s' !"),
+                 event.GetColour().GetAsString(wxC2S_CSS_SYNTAX).c_str());
+}
+#endif
+#if wxUSE_FILEPICKERCTRL
+void PickerWidgetsPage::OnFileChange(wxFileDirPickerEvent& event)
+{
+    wxLogMessage(wxT("The file changed to '%s' ! The current working directory is '%s'"),
+                 event.GetPath().c_str(), wxGetCwd().c_str());
+}
+#endif
+#if wxUSE_DIRPICKERCTRL
+void PickerWidgetsPage::OnDirChange(wxFileDirPickerEvent& event)
+{
+    wxLogMessage(wxT("The directory changed to '%s' ! The current working directory is '%s'"),
+                 event.GetPath().c_str(), wxGetCwd().c_str());
+}
+#endif
+#if wxUSE_FONTPICKERCTRL
+void PickerWidgetsPage::OnFontChange(wxFontPickerEvent& event)
+{
+    wxLogMessage(wxT("The font changed to '%s' with size %d !"),
+                 event.GetFont().GetFaceName().c_str(), event.GetFont().GetPointSize());
+}
+#endif
+
+void PickerWidgetsPage::OnCheckBox(wxCommandEvent &event)
+{
+    if (event.GetEventObject() == m_chkColourTextCtrl ||
+        event.GetEventObject() == m_chkColourShowLabel)
+        RecreatePicker(Picker_Colour);
+
+    if (event.GetEventObject() == m_chkFileTextCtrl ||
+        event.GetEventObject() == m_chkFileOverwritePrompt ||
+        event.GetEventObject() == m_chkFileMustExist ||
+        event.GetEventObject() == m_chkFileChangeDir)
+        RecreatePicker(Picker_File);
+
+    if (event.GetEventObject() == m_chkDirTextCtrl ||
+        event.GetEventObject() == m_chkDirChangeDir ||
+        event.GetEventObject() == m_chkDirMustExist)
+        RecreatePicker(Picker_Dir);
+
+    if (event.GetEventObject() == m_chkFontTextCtrl ||
+        event.GetEventObject() == m_chkFontDescAsLabel ||
+        event.GetEventObject() == m_chkFontUseFontForLabel)
+        RecreatePicker(Picker_Font);
+}
+
+#endif  // wxUSE_COLOURPICKERCTRL || wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL || wxUSE_FONTPICKERCTRL
--- a/samples/widgets/widgets.bkl
+++ b/samples/widgets/widgets.bkl
@@ -13,6 +13,7 @@
            hyperlnk.cpp
            listbox.cpp
            notebook.cpp
+            picker.cpp
            radiobox.cpp
            slider.cpp
            spinbtn.cpp
--- a/samples/widgets/widgets.dsp
+++ b/samples/widgets/widgets.dsp
@@ -500,6 +500,10 @@ SOURCE=.\notebook.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\picker.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\radiobox.cpp
 # End Source File
 # Begin Source File