Index: src/plugins/contrib/wxSmith/wxSmith-unix.cbp
===================================================================
--- src/plugins/contrib/wxSmith/wxSmith-unix.cbp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxSmith-unix.cbp	(working copy)
@@ -318,6 +318,12 @@
 		<Unit filename="wxsversionconverter.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsanimationctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsanimationctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsbitmapbutton.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -372,6 +378,12 @@
 		<Unit filename="wxwidgets/defitems/wxscolourdialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxscolourpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxscolourpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxscombobox.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -402,18 +414,42 @@
 		<Unit filename="wxwidgets/defitems/wxsdirdialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsdirpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsdirpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsfiledialog.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsfiledialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfilepickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfilepickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfindreplacedialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfindreplacedialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsflexgridsizer.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsflexgridsizer.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfontpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsfontpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsframe.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -456,6 +492,12 @@
 		<Unit filename="wxwidgets/defitems/wxshtmlwindow.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxshyperlinkctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxshyperlinkctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxslistbook.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -474,6 +516,12 @@
 		<Unit filename="wxwidgets/defitems/wxslistctrl.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsmediactrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsmediactrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsmenu.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -498,6 +546,12 @@
 		<Unit filename="wxwidgets/defitems/wxsmenuitem.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsmessagedialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsmessagedialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsmultichoicedialog.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -510,12 +564,36 @@
 		<Unit filename="wxwidgets/defitems/wxsnotebook.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxspagesetupdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxspagesetupdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxspanel.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets/defitems/wxspanel.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxspasswordentrydialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxspasswordentrydialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsprintdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsprintdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsprogressdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsprogressdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxsradiobox.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -528,6 +606,18 @@
 		<Unit filename="wxwidgets/defitems/wxsradiobutton.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsrichtextformattingdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsrichtextformattingdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsrichtextstyleorganiserdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxsrichtextstyleorganiserdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxssashlayoutwindow.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -660,6 +750,12 @@
 		<Unit filename="wxwidgets/defitems/wxstextctrl.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets/defitems/wxstextentrydialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets/defitems/wxstextentrydialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets/defitems/wxstimer.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
Index: src/plugins/contrib/wxSmith/wxSmith.cbp
===================================================================
--- src/plugins/contrib/wxSmith/wxSmith.cbp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxSmith.cbp	(working copy)
@@ -341,6 +341,12 @@
 		<Unit filename="wxsversionconverter.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsanimationctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsanimationctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsbitmapbutton.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -395,6 +401,12 @@
 		<Unit filename="wxwidgets\defitems\wxscolourdialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxscolourpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxscolourpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxscombobox.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -425,18 +437,48 @@
 		<Unit filename="wxwidgets\defitems\wxsdirdialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsdirpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsdirpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsfiledialog.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsfiledialog.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfilepickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfilepickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfindreplacedialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfindreplacedialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsflexgridsizer.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsflexgridsizer.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfontdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfontdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfontpickerctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsfontpickerctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsframe.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -479,6 +521,12 @@
 		<Unit filename="wxwidgets\defitems\wxshtmlwindow.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxshyperlinkctrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxshyperlinkctrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxslistbook.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -497,6 +545,12 @@
 		<Unit filename="wxwidgets\defitems\wxslistctrl.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsmediactrl.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsmediactrl.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsmenu.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -521,6 +575,12 @@
 		<Unit filename="wxwidgets\defitems\wxsmenuitem.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsmessagedialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsmessagedialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsmultichoicedialog.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -533,12 +593,36 @@
 		<Unit filename="wxwidgets\defitems\wxsnotebook.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxspagesetupdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxspagesetupdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxspanel.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
 		<Unit filename="wxwidgets\defitems\wxspanel.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxspasswordentrydialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxspasswordentrydialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsprintdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsprintdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsprogressdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsprogressdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxsradiobox.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -551,6 +635,18 @@
 		<Unit filename="wxwidgets\defitems\wxsradiobutton.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsrichtextformattingdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsrichtextformattingdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsrichtextstyleorganiserdialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxsrichtextstyleorganiserdialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxssashlayoutwindow.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
@@ -683,6 +779,12 @@
 		<Unit filename="wxwidgets\defitems\wxstextctrl.h">
 			<Option target="wxSmithLib" />
 		</Unit>
+		<Unit filename="wxwidgets\defitems\wxstextentrydialog.cpp">
+			<Option target="wxSmithLib" />
+		</Unit>
+		<Unit filename="wxwidgets\defitems\wxstextentrydialog.h">
+			<Option target="wxSmithLib" />
+		</Unit>
 		<Unit filename="wxwidgets\defitems\wxstimer.cpp">
 			<Option target="wxSmithLib" />
 		</Unit>
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am	(working copy)
@@ -74,7 +74,24 @@
 ./wxssingleinstancechecker.cpp \
 ./wxsstopwatch.cpp \
 ./wxssymbolpickerdialog.cpp \
-./wxsglcanvas.cpp
+./wxsglcanvas.cpp \
+./wxshyperlinkctrl.cpp \
+./wxsanimationctrl.cpp \
+./wxsmediactrl.cpp \
+./wxsfindreplacedialog.cpp \
+./wxsfontdialog.cpp \
+./wxsmessagedialog.cpp \
+./wxspagesetupdialog.cpp \
+./wxspasswordentrydialog.cpp \
+./wxsprintdialog.cpp \
+./wxsprogressdialog.cpp \
+./wxsrichtextformattingdialog.cpp \
+./wxsrichtextstyleorganiserdialog.cpp \
+./wxstextentrydialog.cpp \
+./wxscolourpickerctrl.cpp \
+./wxsdirpickerctrl.cpp \
+./wxsfilepickerctrl.cpp \
+./wxsfontpickerctrl.cpp 
 
 noinst_HEADERS = \
 ./wxsgauge.h \
@@ -139,5 +156,22 @@
 ./wxssingleinstancechecker.h \
 ./wxsstopwatch.h \
 ./wxssymbolpickerdialog.h \
-./wxsglcanvas.h
+./wxsglcanvas.h \
+./wxshyperlinkctrl.h \
+./wxsanimationctrl.h \
+./wxsmediactrl.h \
+./wxsfindreplacedialog.h \
+./wxsfontdialog.h \
+./wxsmessagedialog.h \
+./wxspagesetupdialog.h \
+./wxspasswordentrydialog.h \
+./wxsprintdialog.h \
+./wxsprogressdialog.h \
+./wxsrichtextformattingdialog.h \
+./wxsrichtextstyleorganiserdialog.h \
+./wxstextentrydialog.h \
+./wxscolourpickerctrl.h \
+./wxsdirpickerctrl.h \
+./wxsfilepickerctrl.h \
+./wxsfontpickerctrl.h 
 
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxscalendarctrl.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
@@ -26,7 +27,7 @@
 
 namespace
 {
-    wxsRegisterItem<wxsCalendarCtrl> Reg(_T("CalendarCtrl"),wxsTWidget,_T("Advanced"),30);
+    wxsRegisterItem<wxsCalendarCtrl> Reg(_T("CalendarCtrl"),wxsTWidget,_T("Advanced"),150);
 
     WXS_ST_BEGIN(wxsCalendarCtrlStyles,_T(""))
         WXS_ST_CATEGORY("wxCalendarCtrl")
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscalendarctrl.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxscalendarctrl.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.cpp	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.cpp	(revision 0)
@@ -0,0 +1,116 @@
+/**  \file wxscolourpickerctrl.cpp
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#include "wxscolourpickerctrl.h"
+
+#include <wx/clrpicker.h>
+
+namespace
+{
+    wxsRegisterItem<wxsColourPickerCtrl> Reg(_T("ColourPickerCtrl"), wxsTWidget, _T("Advanced"), 140);
+
+    WXS_ST_BEGIN(wxsColourPickerCtrlStyles, _T(""))
+        WXS_ST_CATEGORY("wxColourPickerCtrl")
+        WXS_ST(wxCLRP_SHOW_LABEL)
+        WXS_ST(wxCLRP_USE_TEXTCTRL)
+    WXS_ST_END()
+
+
+    WXS_EV_BEGIN(wxsColourPickerCtrlEvents)
+        WXS_EVI(EVT_COLOURPICKER_CHANGED, wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent, ColourChanged)
+    WXS_EV_END()
+}
+
+/*! \brief Ctor
+ *
+ * \param Data wxsItemResData*	The control's resource data.
+ *
+ */
+wxsColourPickerCtrl::wxsColourPickerCtrl(wxsItemResData* Data):
+    wxsWidget(
+        Data,
+        &Reg.Info,
+        wxsColourPickerCtrlEvents,
+        wxsColourPickerCtrlStyles),
+        m_cdColour(*wxBLACK)
+{}
+
+/*! \brief Create the initial control.
+ *
+ * \return void
+ *
+ */
+void wxsColourPickerCtrl::OnBuildCreatingCode()
+{
+    switch ( GetLanguage() )
+    {
+        case wxsCPP:
+        {
+            AddHeader(_T("<wx/clrpicker.h>"),GetInfo().ClassName,0);
+
+			wxString ss = m_cdColour.BuildCode(GetCoderContext());
+			#if wxCHECK_VERSION(2, 9, 0)
+            Codef(_T("%C(%W, %I, %s, %P, %S, %T, %V, %N);\n"), ss.wx_str());
+			#else
+            Codef(_T("%C(%W, %I, %s, %P, %S, %T, %V, %N);\n"), ss.c_str());
+			#endif
+
+            BuildSetupWindowCode();
+            return;
+        }
+
+        default:
+        {
+            wxsCodeMarks::Unknown(_T("wxsColourPickerCtrl::OnBuildCreatingCode"),GetLanguage());
+        }
+    }
+}
+
+
+/*! \brief	Buld the control preview.
+ *
+ * \param parent wxWindow*	The parent window.
+ * \param flags long				The control flags.
+ * \return wxObject* 				The constructed control.
+ *
+ */
+wxObject* wxsColourPickerCtrl::OnBuildPreview(wxWindow* Parent,long Flags)
+{
+	wxColourPickerCtrl* Preview;
+    wxColour clr = m_cdColour.GetColour();
+    if(clr.IsOk()){
+		Preview = new wxColourPickerCtrl(Parent, GetId(), clr, Pos(Parent), Size(Parent), Style());
+    }
+    else{
+		Preview = new wxColourPickerCtrl(Parent, GetId(), *wxBLACK, Pos(Parent), Size(Parent), Style());
+    }
+    return SetupWindow(Preview,Flags);
+}
+
+/*! \brief Enumerate the control's properties.
+ *
+ * \param flags long	The control flags.
+ * \return void
+ *
+ */
+void wxsColourPickerCtrl::OnEnumWidgetProperties(long Flags)
+{
+    WXS_COLOUR(wxsColourPickerCtrl, m_cdColour, _("Colour"), _T("colour"));
+}
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.h	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxscolourpickerctrl.h	(revision 0)
@@ -0,0 +1,42 @@
+/**  \file wxscolourpickerctrl.h
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#ifndef WXSCOLOURPICKERCTRL_H
+#define WXSCOLOURPICKERCTRL_H
+
+#include "../wxswidget.h"
+
+/** \brief Class for wxsColourPickerCtrl widget */
+class wxsColourPickerCtrl: public wxsWidget
+{
+    public:
+
+        wxsColourPickerCtrl(wxsItemResData* Data);
+
+    private:
+
+        virtual void OnBuildCreatingCode();
+        virtual wxObject* OnBuildPreview(wxWindow* Parent,long Flags);
+        virtual void OnEnumWidgetProperties(long Flags);
+
+		wxsColourData	m_cdColour;		//!< The selected colour.
+};
+
+#endif
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsdatepickerctrl.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
@@ -26,7 +27,7 @@
 
 namespace
 {
-    wxsRegisterItem<wxsDatePickerCtrl> Reg(_T("DatePickerCtrl"),wxsTWidget,_T("Advanced"),30);
+    wxsRegisterItem<wxsDatePickerCtrl> Reg(_T("DatePickerCtrl"),wxsTWidget,_T("Advanced"),130);
 
     WXS_ST_BEGIN(wxsDatePickerCtrlStyles,_T("wxDP_DEFAULT|wxDP_SHOWCENTURY"))
         WXS_ST_CATEGORY("wxDatePickerCtrl")
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdatepickerctrl.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsdatepickerctrl.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.cpp	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.cpp	(revision 0)
@@ -0,0 +1,116 @@
+/**  \file wxsdirpickerctrl.cpp
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#include "wxsdirpickerctrl.h"
+
+#include <wx/filepicker.h>
+
+namespace
+{
+    wxsRegisterItem<wxsDirPickerCtrl> Reg(_T("DirPickerCtrl"), wxsTWidget, _T("Advanced"), 120);
+
+#ifdef __WXGTK__
+    // GTK apps usually don't have a textctrl next to the picker
+    WXS_ST_BEGIN(wxsDirPickerCtrlStyles,_T("wxDIRP_DIR_MUST_EXIST"))
+#else
+    WXS_ST_BEGIN(wxsDirPickerCtrlStyles,_T("wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST"))
+#endif
+		WXS_ST_CATEGORY("wxDirPickerCtrl")
+        WXS_ST(wxDIRP_CHANGE_DIR)
+        WXS_ST(wxDIRP_DIR_MUST_EXIST)
+        WXS_ST(wxDIRP_USE_TEXTCTRL)
+    WXS_ST_END()
+
+
+    WXS_EV_BEGIN(wxsDirPickerCtrlEvents)
+        WXS_EVI(EVT_DIRPICKER_CHANGED, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent , DirChanged)
+    WXS_EV_END()
+}
+
+/*! \brief Ctor
+ *
+ * \param Data wxsItemResData*	The control's resource data.
+ *
+ */
+wxsDirPickerCtrl::wxsDirPickerCtrl(wxsItemResData* Data):
+    wxsWidget(
+        Data,
+        &Reg.Info,
+        wxsDirPickerCtrlEvents,
+        wxsDirPickerCtrlStyles),
+        m_sMessage(wxDirSelectorPromptStr),
+        m_sPath(wxEmptyString)
+{}
+
+/*! \brief Create the initial control.
+ *
+ * \return void
+ *
+ */
+void wxsDirPickerCtrl::OnBuildCreatingCode()
+{
+    switch ( GetLanguage() )
+    {
+        case wxsCPP:
+        {
+            AddHeader(_T("<wx/filepicker.h>"),GetInfo().ClassName,0);
+
+			#if wxCHECK_VERSION(2, 9, 0)
+            Codef(_T("%C(%W, %I, %n %t, %P, %S, %T, %V, %N);\n"), m_sPath.wx_str(), m_sMessage.wx_str());
+			#else
+            Codef(_T("%C(%W, %I, %n, %t, %P, %S, %T, %V, %N);\n"), m_sPath.c_str(), m_sMessage.c_str());
+			#endif
+
+            BuildSetupWindowCode();
+            return;
+        }
+
+        default:
+        {
+            wxsCodeMarks::Unknown(_T("wxsDirPickerCtrl::OnBuildCreatingCode"),GetLanguage());
+        }
+    }
+}
+
+/*! \brief	Buld the control preview.
+ *
+ * \param parent wxWindow*	The parent window.
+ * \param flags long					The control flags.
+ * \return wxObject* 					The constructed control.
+ *
+ */
+wxObject* wxsDirPickerCtrl::OnBuildPreview(wxWindow* Parent,long Flags)
+{
+	wxDirPickerCtrl* Preview;
+	Preview = new wxDirPickerCtrl(Parent, GetId(), m_sPath, m_sMessage, Pos(Parent), Size(Parent), Style());
+    return SetupWindow(Preview,Flags);
+}
+
+/*! \brief Enumerate the control's properties.
+ *
+ * \param flags long	The control flags.
+ * \return void
+ *
+ */
+void wxsDirPickerCtrl::OnEnumWidgetProperties(long Flags)
+{
+    WXS_SHORT_STRING(wxsDirPickerCtrl, m_sMessage, _("Message"), _T("message"), wxDirSelectorPromptStr, false)
+    WXS_SHORT_STRING(wxsDirPickerCtrl, m_sPath, _("Path"), _T("path"), wxEmptyString, false)
+}
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.h	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsdirpickerctrl.h	(revision 0)
@@ -0,0 +1,43 @@
+/**  \file wxsdirpickerctrl.h
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#ifndef WXSDIRPICKERCTRL_H
+#define WXSDIRPICKERCTRL_H
+
+#include "../wxswidget.h"
+
+/** \brief Class for wxsDirPickerCtrl widget */
+class wxsDirPickerCtrl: public wxsWidget
+{
+    public:
+
+        wxsDirPickerCtrl(wxsItemResData* Data);
+
+    private:
+
+        virtual void OnBuildCreatingCode();
+        virtual wxObject* OnBuildPreview(wxWindow* Parent,long Flags);
+        virtual void OnEnumWidgetProperties(long Flags);
+
+		wxString	m_sMessage;		//!< The dialogue message.
+		wxString	m_sPath;				//!< The directory path.
+};
+
+#endif
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.cpp	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.cpp	(revision 0)
@@ -0,0 +1,121 @@
+/**  \file wxsfilepickerctrl.cpp
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#include "wxsfilepickerctrl.h"
+
+#include <wx/filepicker.h>
+
+namespace
+{
+    wxsRegisterItem<wxsFilePickerCtrl> Reg(_T("FilePickerCtrl"), wxsTWidget, _T("Advanced"), 110);
+
+#ifdef __WXGTK__
+    // GTK apps usually don't have a textctrl next to the picker
+    WXS_ST_BEGIN(wxsFilePickerCtrlStyles,_T("wxFLP_OPEN|wxFLP_FILE_MUST_EXIST"))
+#else
+    WXS_ST_BEGIN(wxsFilePickerCtrlStyles,_T("wxFLP_USE_TEXTCTRL|wxFLP_OPEN|wxFLP_FILE_MUST_EXIST"))
+#endif
+		WXS_ST_CATEGORY("wxFilePickerCtrl")
+        WXS_ST(wxFLP_CHANGE_DIR)
+        WXS_ST(wxFLP_FILE_MUST_EXIST)
+        WXS_ST(wxFLP_OPEN)
+        WXS_ST(wxFLP_OVERWRITE_PROMPT)
+        WXS_ST(wxFLP_SAVE)
+        WXS_ST(wxFLP_USE_TEXTCTRL)
+    WXS_ST_END()
+
+
+    WXS_EV_BEGIN(wxsFilePickerCtrlEvents)
+        WXS_EVI(EVT_FILEPICKER_CHANGED, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent , FileChanged)
+    WXS_EV_END()
+}
+
+/*! \brief Ctor
+ *
+ * \param Data wxsItemResData*	The control's resource data.
+ *
+ */
+wxsFilePickerCtrl::wxsFilePickerCtrl(wxsItemResData* Data):
+    wxsWidget(
+        Data,
+        &Reg.Info,
+        wxsFilePickerCtrlEvents,
+        wxsFilePickerCtrlStyles),
+        m_sMessage(wxFileSelectorPromptStr),
+        m_sPath(wxEmptyString),
+        m_sWildcard(wxFileSelectorDefaultWildcardStr)
+{}
+
+/*! \brief Create the initial control.
+ *
+ * \return void
+ *
+ */
+void wxsFilePickerCtrl::OnBuildCreatingCode()
+{
+    switch ( GetLanguage() )
+    {
+        case wxsCPP:
+        {
+            AddHeader(_T("<wx/filepicker.h>"),GetInfo().ClassName,0);
+
+			#if wxCHECK_VERSION(2, 9, 0)
+            Codef(_T("%C(%W, %I, %n %t, %n, %P, %S, %T, %V, %N);\n"), m_sPath.wx_str(), m_sMessage.wx_str(), m_sWildcard.wx_str());
+			#else
+            Codef(_T("%C(%W, %I, %n, %t, %n, %P, %S, %T, %V, %N);\n"), m_sPath.c_str(), m_sMessage.c_str(), m_sWildcard.c_str());
+			#endif
+
+            BuildSetupWindowCode();
+            return;
+        }
+
+        default:
+        {
+            wxsCodeMarks::Unknown(_T("wxsFilePickerCtrl::OnBuildCreatingCode"),GetLanguage());
+        }
+    }
+}
+
+/*! \brief	Buld the control preview.
+ *
+ * \param parent wxWindow*	The parent window.
+ * \param flags long					The control flags.
+ * \return wxObject* 					The constructed control.
+ *
+ */
+wxObject* wxsFilePickerCtrl::OnBuildPreview(wxWindow* Parent,long Flags)
+{
+	wxFilePickerCtrl* Preview;
+	Preview = new wxFilePickerCtrl(Parent, GetId(), m_sPath, m_sMessage, m_sWildcard, Pos(Parent), Size(Parent), Style());
+    return SetupWindow(Preview,Flags);
+}
+
+/*! \brief Enumerate the control's properties.
+ *
+ * \param flags long	The control flags.
+ * \return void
+ *
+ */
+void wxsFilePickerCtrl::OnEnumWidgetProperties(long Flags)
+{
+    WXS_SHORT_STRING(wxsFilePickerCtrl, m_sMessage, _("Message"), _T("message"), wxFileSelectorPromptStr, false)
+    WXS_SHORT_STRING(wxsFilePickerCtrl, m_sPath, _("Path"), _T("path"), wxEmptyString, false)
+    WXS_SHORT_STRING(wxsFilePickerCtrl, m_sWildcard, _("Wildcard"), _T("wildcard"), wxFileSelectorDefaultWildcardStr, false)
+}
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.h	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfilepickerctrl.h	(revision 0)
@@ -0,0 +1,44 @@
+/**  \file wxsfilepickerctrl.h
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#ifndef WXSFILEPICKERCTRL_H
+#define WXSFILEPICKERCTRL_H
+
+#include "../wxswidget.h"
+
+/** \brief Class for wxsFilePickerCtrl widget */
+class wxsFilePickerCtrl: public wxsWidget
+{
+    public:
+
+        wxsFilePickerCtrl(wxsItemResData* Data);
+
+    private:
+
+        virtual void OnBuildCreatingCode();
+        virtual wxObject* OnBuildPreview(wxWindow* Parent,long Flags);
+        virtual void OnEnumWidgetProperties(long Flags);
+
+		wxString	m_sMessage;		//!< The dialogue message.
+		wxString	m_sPath;				//!< The directory path.
+		wxString	m_sWildcard;		//!< The wildcard string.
+};
+
+#endif
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.cpp	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.cpp	(revision 0)
@@ -0,0 +1,117 @@
+/**  \file wxsfontpickerctrl.cpp
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#include "wxsfontpickerctrl.h"
+
+#include <wx/fontpicker.h>
+
+namespace
+{
+    wxsRegisterItem<wxsFontPickerCtrl> Reg(_T("FontPickerCtrl"), wxsTWidget, _T("Advanced"), 100);
+
+    WXS_ST_BEGIN(wxsFontPickerCtrlStyles,_T("wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL"))
+		WXS_ST_CATEGORY("wxFontPickerCtrl")
+        WXS_ST(wxFNTP_FONTDESC_AS_LABEL)
+        WXS_ST(wxFNTP_USEFONT_FOR_LABEL)
+        WXS_ST(wxFNTP_USE_TEXTCTRL)
+    WXS_ST_END()
+
+
+    WXS_EV_BEGIN(wxsFontPickerCtrlEvents)
+        WXS_EVI(EVT_FONTPICKER_CHANGED, wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent, FontChanged)
+    WXS_EV_END()
+}
+
+/*! \brief Ctor
+ *
+ * \param Data wxsItemResData*	The control's resource data.
+ *
+ */
+wxsFontPickerCtrl::wxsFontPickerCtrl(wxsItemResData* Data):
+    wxsWidget(
+        Data,
+        &Reg.Info,
+        wxsFontPickerCtrlEvents,
+        wxsFontPickerCtrlStyles,
+        flVariable | flId | flPosition | flSize | flEnabled | flFocused | flHidden | flColours  | flToolTip | flHelpText | flSubclass | flMinMaxSize | flExtraCode)
+{}
+
+/*! \brief Create the initial control.
+ *
+ * \return void
+ *
+ */
+void wxsFontPickerCtrl::OnBuildCreatingCode()
+{
+    switch ( GetLanguage() )
+    {
+        case wxsCPP:
+        {
+            AddHeader(_T("<wx/fontpicker.h>"),GetInfo().ClassName,0);
+
+			wxString sFntName = GetCoderContext()->GetUniqueName(_T("PickerFont"));
+			wxString sFnt = m_fdFont.BuildFontCode(sFntName, GetCoderContext());
+			if(!sFnt.Len() > 0){
+				sFntName = wxT("wxNullFont");
+			}
+			#if wxCHECK_VERSION(2, 9, 0)
+			Codef(_T("%s"), sFnt.wx_str());
+			Codef(_T("%C(%W, %I, %s, %P, %S, %T, %V, %N);\n"), sFntName.wx_str());
+			#else
+			Codef(_T("%s"), sFnt.c_str());
+			Codef(_T("%C(%W, %I, %s, %P, %S, %T, %V, %N);\n"), sFntName.c_str());
+			#endif
+
+            BuildSetupWindowCode();
+            return;
+        }
+
+        default:
+        {
+            wxsCodeMarks::Unknown(_T("wxsFontPickerCtrl::OnBuildCreatingCode"),GetLanguage());
+        }
+    }
+}
+
+/*! \brief	Buld the control preview.
+ *
+ * \param parent wxWindow*	The parent window.
+ * \param flags long					The control flags.
+ * \return wxObject* 					The constructed control.
+ *
+ */
+wxObject* wxsFontPickerCtrl::OnBuildPreview(wxWindow* Parent,long Flags)
+{
+	wxFontPickerCtrl* Preview;
+	wxFont fnt = m_fdFont.BuildFont();
+	Preview = new wxFontPickerCtrl(Parent, GetId(), fnt, Pos(Parent), Size(Parent), Style());
+    return SetupWindow(Preview,Flags);
+}
+
+/*! \brief Enumerate the control's properties.
+ *
+ * \param flags long	The control flags.
+ * \return void
+ *
+ */
+void wxsFontPickerCtrl::OnEnumWidgetProperties(long Flags)
+{
+    WXS_FONT(wxsFontPickerCtrl, m_fdFont, _("Font"), _T("font"))
+}
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.h	(revision 0)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsfontpickerctrl.h	(revision 0)
@@ -0,0 +1,42 @@
+/**  \file wxsfontpickerctrl.h
+*
+* This file is part of wxSmith plugin for Code::Blocks Studio
+* Copyright (C) 2010 Gary Harris
+*
+* wxSmith is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* wxSmith is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+#ifndef WXSFONTPICKERCTRL_H
+#define WXSFONTPICKERCTRL_H
+
+#include "../wxswidget.h"
+
+/** \brief Class for wxsFontPickerCtrl widget */
+class wxsFontPickerCtrl: public wxsWidget
+{
+    public:
+
+        wxsFontPickerCtrl(wxsItemResData* Data);
+
+    private:
+
+        virtual void OnBuildCreatingCode();
+        virtual wxObject* OnBuildPreview(wxWindow* Parent,long Flags);
+        virtual void OnEnumWidgetProperties(long Flags);
+
+		wxsFontData	m_fdFont;		//!< The font.
+};
+
+#endif
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsgenericdirctrl.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
@@ -26,7 +27,7 @@
 
 namespace
 {
-    wxsRegisterItem<wxsGenericDirCtrl> Reg(_T("GenericDirCtrl"),wxsTWidget,_T("Advanced"),30);
+    wxsRegisterItem<wxsGenericDirCtrl> Reg(_T("GenericDirCtrl"),wxsTWidget,_T("Advanced"),90);
 
     WXS_ST_BEGIN(wxsGenericDirCtrlStyles,_T(""))
         WXS_ST_CATEGORY("wxGenericDirCtrl")
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgenericdirctrl.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsgenericdirctrl.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsglcanvas.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2008 Ron Collins
 *
@@ -53,7 +54,7 @@
         _T("GLCanvas"),                 // Class name
         wxsTWidget,                     // Item type
         _T("Advanced"),                 // Category in palette
-        75,                             // Priority in palette
+        80,                             // Priority in palette
         false);                         // We do not allow this item inside XRC files
 
 
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsglcanvas.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsglcanvas.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2008 Ron Collins
 *
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsgrid.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2008  Bartlomiej Swiecki
 * Copyright (C) 2008 Ron Collins
@@ -26,7 +27,7 @@
 
 namespace
 {
-    wxsRegisterItem<wxsGrid> Reg(_T("Grid"),wxsTWidget,_T("Advanced"),50);
+    wxsRegisterItem<wxsGrid> Reg(_T("Grid"),wxsTWidget,_T("Advanced"),70);
 
     WXS_ST_BEGIN(wxsGridStyles,_T(""))
         WXS_ST_DEFAULTS()
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsgrid.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxsgrid.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2008  Bartlomiej Swiecki
 * Copyright (C) 2008 Ron Collins
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.cpp	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.cpp	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxshtmlwindow.cpp
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
@@ -25,7 +26,7 @@
 
 namespace
 {
-    wxsRegisterItem<wxsHtmlWindow> Reg(_T("HtmlWindow"),wxsTWidget,_T("Advanced"),50);
+    wxsRegisterItem<wxsHtmlWindow> Reg(_T("HtmlWindow"),wxsTWidget,_T("Advanced"),60);
 
     WXS_ST_BEGIN(wxsHtmlWindowStyles,_T("wxHW_SCROLLBAR_AUTO"))
         WXS_ST_CATEGORY("wxHtmlWindow")
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.h
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.h	(revision 6328)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxshtmlwindow.h	(working copy)
@@ -1,4 +1,5 @@
-/*
+/**  \file wxshtmlwindow.h
+*
 * This file is part of wxSmith plugin for Code::Blocks Studio
 * Copyright (C) 2006-2007  Bartlomiej Swiecki
 *
