Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / src / _picker.i

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index d3ca422fcf230d81e77d06790782919d1c1e76ad..3d1384ca96aae8d93ef247bf3fceebcf35bac150 100644 (file)
--- a/wxPython/src/_picker.i
+++ b/wxPython/src/_picker.i
@@ -153,6 +153,7 @@ clicked. Native implementations may differ but this is usually a
 "
 Window Styles
 -------------
 "
 Window Styles
 -------------

+

     ======================  ============================================
     wx.CLRP_DEFAULT         Default style.
     wx.CLRP_USE_TEXTCTRL    Creates a text control to the left of the
     ======================  ============================================
     wx.CLRP_DEFAULT         Default style.
     wx.CLRP_USE_TEXTCTRL    Creates a text control to the left of the


@@ -168,6 +169,7 @@ Window Styles
 
 Events
 ------
 
 Events
 ------

+

     ========================  ==========================================
     EVT_COLOURPICKER_CHANGED  The user changed the colour selected in the
                               control either using the button or using the
     ========================  ==========================================
     EVT_COLOURPICKER_CHANGED  The user changed the colour selected in the
                               control either using the button or using the


@@ -400,7 +402,7 @@ public:
 
     wxFontPickerCtrl(wxWindow *parent,
                      wxWindowID id=-1,
 
     wxFontPickerCtrl(wxWindow *parent,
                      wxWindowID id=-1,

-                     const wxFont& initial = *wxNORMAL_FONT,
+                     const wxFont& initial = wxNullFont,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,


@@ -410,7 +412,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id=-1,
 
     bool Create(wxWindow *parent,
                 wxWindowID id=-1,

-                const wxFont& initial = *wxNORMAL_FONT,
+                const wxFont& initial = wxNullFont,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,